From cfbd58b15e5074e88c6b9f233d9c46b662adf858 Mon Sep 17 00:00:00 2001 From: hbruintjes Date: Fri, 22 Apr 2016 14:14:14 +0200 Subject: [PATCH] Enable dynamic linking on linux, and replace xerces find module by system version Former-commit-id: 6f6864404da695c3333869ca286a40f2457b86fe --- CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fe0ac0b..40aa7e182 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ option(STORM_COMPILE_WITH_CCACHE "Compile using CCache [if found]" ON) mark_as_advanced(STORM_COMPILE_WITH_CCACHE) option(STORM_LOG_DISABLE_DEBUG "Disable log and trace message support" OFF) option(STORM_USE_CLN_NUMBERS "Sets whether CLN or GMP numbers should be used" ON) +option(BUILD_SHARED_LIBS "Build the Storm library dynamically" OFF) set(BOOST_ROOT "" CACHE STRING "A hint to the root directory of Boost (optional).") set(GUROBI_ROOT "" CACHE STRING "A hint to the root directory of Gurobi (optional).") set(Z3_ROOT "" CACHE STRING "A hint to the root directory of Z3 (optional).") @@ -107,12 +108,15 @@ message(STATUS "Storm - Detected operating system ${OPERATING_SYSTEM}.") set(DYNAMIC_EXT ".so") set(STATIC_EXT ".a") +set(LIB_PREFIX "lib") if(MACOSX) set(DYNAMIC_EXT ".dylib") set(STATIC_EXT ".a") + set(LIB_PREFIX "lib") elseif (WIN32) set(DYNAMIC_EXT ".dll") set(STATIC_EXT ".lib") + set(LIB_PREFIX "") endif() message(STATUS "Assuming extension for shared libraries: ${DYNAMIC_EXT}") message(STATUS "Assuming extension for static libraries: ${STATIC_EXT}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39c35964f..936c1181b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,4 +4,3 @@ add_subdirectory(storm-pgcl-cli) add_subdirectory(test) -