From 2dbbc294100495a9f7f6c432648bce9ea9b22262 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 28 Dec 2022 14:30:18 -0700 Subject: [PATCH] update parallel rsp --- parallel-rsp/CMakeLists.txt | 14 +++++++++++--- parallel-rsp/win32/mman/sys/CMakeLists.txt | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/parallel-rsp/CMakeLists.txt b/parallel-rsp/CMakeLists.txt index e8aad61..07bc5e3 100644 --- a/parallel-rsp/CMakeLists.txt +++ b/parallel-rsp/CMakeLists.txt @@ -1,4 +1,6 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) +set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") + set(CMAKE_CXX_STANDARD 14) set(CMAKE_C_STANDARD 99) project(parallel-rsp LANGUAGES CXX C) @@ -99,7 +101,13 @@ if (PARALLEL_RSP_BAKED_LIGHTNING) set_property(TARGET lightning PROPERTY CXX_VISIBILITY_PRESET hidden) set_property(TARGET lightning PROPERTY VISIBILITY_INLINES_HIDDEN ON) target_compile_options(lightning PRIVATE -march=x86-64-v3 -DHAVE_MMAP -Ofast) - target_link_options(lightning PRIVATE -march=x86-64-v3 -DHAVE_MMAP -Ofast -Wl,-Bsymbolic -Wl,-Bsymbolic-functions) + target_link_options(lightning PRIVATE -march=x86-64-v3 -DHAVE_MMAP -Ofast) + if (NOT APPLE) + target_link_options(lightning PRIVATE -Wl,-Bsymbolic -Wl,-Bsymbolic-functions) + endif (NOT APPLE) endif() -target_link_options(${NAME_PLUGIN_SIMPLE64} PRIVATE -march=x86-64-v3 -Ofast -Wl,-Bsymbolic -Wl,-Bsymbolic-functions) +target_link_options(${NAME_PLUGIN_SIMPLE64} PRIVATE -march=x86-64-v3 -Ofast) +if (NOT APPLE) + target_link_options(${NAME_PLUGIN_SIMPLE64} PRIVATE -Wl,-Bsymbolic -Wl,-Bsymbolic-functions) +endif (NOT APPLE) target_link_libraries(${NAME_PLUGIN_SIMPLE64} PUBLIC lightning) diff --git a/parallel-rsp/win32/mman/sys/CMakeLists.txt b/parallel-rsp/win32/mman/sys/CMakeLists.txt index 9a1c166..ced7420 100644 --- a/parallel-rsp/win32/mman/sys/CMakeLists.txt +++ b/parallel-rsp/win32/mman/sys/CMakeLists.txt @@ -1,6 +1,7 @@ -project (mman-win32 C) +cmake_minimum_required (VERSION 3.24) +set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") -cmake_minimum_required (VERSION 3.20) +project (mman-win32 C) option (BUILD_SHARED_LIBS "shared/static libs" ON) option (BUILD_TESTS "tests?" OFF)