Browse Source

Enable dynamic linking on linux, and replace xerces find module by system version

Former-commit-id: 6f6864404d
tempestpy_adaptions
hbruintjes 9 years ago
committed by Matthias Volk
parent
commit
cfbd58b15e
  1. 4
      CMakeLists.txt
  2. 1
      src/CMakeLists.txt

4
CMakeLists.txt

@ -39,6 +39,7 @@ option(STORM_COMPILE_WITH_CCACHE "Compile using CCache [if found]" ON)
mark_as_advanced(STORM_COMPILE_WITH_CCACHE) mark_as_advanced(STORM_COMPILE_WITH_CCACHE)
option(STORM_LOG_DISABLE_DEBUG "Disable log and trace message support" OFF) 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(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(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(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).") 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(DYNAMIC_EXT ".so")
set(STATIC_EXT ".a") set(STATIC_EXT ".a")
set(LIB_PREFIX "lib")
if(MACOSX) if(MACOSX)
set(DYNAMIC_EXT ".dylib") set(DYNAMIC_EXT ".dylib")
set(STATIC_EXT ".a") set(STATIC_EXT ".a")
set(LIB_PREFIX "lib")
elseif (WIN32) elseif (WIN32)
set(DYNAMIC_EXT ".dll") set(DYNAMIC_EXT ".dll")
set(STATIC_EXT ".lib") set(STATIC_EXT ".lib")
set(LIB_PREFIX "")
endif() endif()
message(STATUS "Assuming extension for shared libraries: ${DYNAMIC_EXT}") message(STATUS "Assuming extension for shared libraries: ${DYNAMIC_EXT}")
message(STATUS "Assuming extension for static libraries: ${STATIC_EXT}") message(STATUS "Assuming extension for static libraries: ${STATIC_EXT}")

1
src/CMakeLists.txt

@ -4,4 +4,3 @@ add_subdirectory(storm-pgcl-cli)
add_subdirectory(test) add_subdirectory(test)
Loading…
Cancel
Save