From 436ed6ca08828249aba2414b604d22e63531c96c Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 27 Sep 2022 21:16:20 +0200 Subject: [PATCH] fixes shared libraries build --- CMakeLists.txt | 13 ++++++++++--- scc | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 335d83c..8187a95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,12 @@ set(WITH_LLVM FALSE CACHE BOOL "Build LLVM based backend") include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +set(CMAKE_INSTALL_RPATH "$\{ORIGIN\}") include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) @@ -34,10 +36,15 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") endif() include(ConanInline) +if(BUILD_SHARED_LIBS) + set(SHARED_FLAG "True") +else() + set(SHARED_FLAG "False") +endif() set(CONAN_BOOST_OPTIONS boost:fPIC=True -boost:shared=False +boost:shared=${SHARED_FLAG} boost:header_only=False boost:without_contract=True boost:without_graph=True @@ -66,7 +73,7 @@ if(NOT DEFINED ENV{SYSTEMC_HOME}) systemc-cci/1.0.0 ) set(CONAN_SETTINGS ${CONAN_SETTINGS} - #systemc:phase_cb=False + systemc:shared=${SHARED_FLAG} systemc-cci:shared=False ) endif() diff --git a/scc b/scc index 7206ec0..452e3ee 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 7206ec01b2d1606560922d48dff9a52243b96441 +Subproject commit 452e3ee2af32e9f9de64e8c25f2874715f4f7780