From e83147ed42900875acece797e7edb296cb4297db Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 17 Feb 2016 21:37:20 +0100 Subject: [PATCH 1/4] include storm version only once Former-commit-id: 52b0ccfd28c8f662597221a598c2567a50a76bee --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 398571b27..1707dfeb6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,7 +106,7 @@ endif(ADDITIONAL_LINK_DIRS) ## All link_directories() calls MUST be made before this point # ## # ############################################################################### -add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS} ${STORM_GENERATED_SOURCES}) # Adding headers for xcode +add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode add_dependencies(storm sylvan) add_dependencies(storm resources) add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) From 559142919dbf5f02f4f7255bf02f5790359ec3a5 Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 17 Feb 2016 22:07:45 +0100 Subject: [PATCH 2/4] hotfix for segfaults, compile storm and log4cplus static Former-commit-id: c4b18d9c838970b51b222fa5848d46ce0dcbd5e0 --- CMakeLists.txt | 6 +++--- resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8104b21d6..9dfa69fbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -580,7 +580,7 @@ endif() ## Log4CPlus ## ############################################################# -set(BUILD_SHARED_LIBS ON CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") +set(BUILD_SHARED_LIBS OFF CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") set(LOG4CPLUS_BUILD_LOGGINGSERVER OFF) set(LOG4CPLUS_BUILD_TESTING OFF) set(LOG4CPLUS_USE_UNICODE OFF) @@ -589,7 +589,7 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include") include_directories("${PROJECT_BINARY_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include") # This adds the defines.hxx file -list(APPEND STORM_LINK_LIBRARIES log4cplus) +list(APPEND STORM_LINK_LIBRARIES log4cplusS) if (UNIX AND NOT APPLE) list(APPEND STORM_LINK_LIBRARIES rt) endif(UNIX AND NOT APPLE) @@ -720,7 +720,7 @@ configure_file ( # Configure a header file to pass the storm version to the source code configure_file ( "${PROJECT_SOURCE_DIR}/storm-version.cpp.in" - "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp" + "${PROJECT_SOURCE_DIR}/src/utility/storm-version.cpp" ) set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp") diff --git a/resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt b/resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt index fdd3b55a0..eb2ac40b3 100644 --- a/resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt +++ b/resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT LOG4CPLUS_SINGLE_THREADED) message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") endif(NOT LOG4CPLUS_SINGLE_THREADED) -set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") +set(BUILD_SHARED_LIBS FALSE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") if (WIN32) set (UNICODE_DEFAULT ON) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1707dfeb6..5b06a498d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,7 +106,7 @@ endif(ADDITIONAL_LINK_DIRS) ## All link_directories() calls MUST be made before this point # ## # ############################################################################### -add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode +add_library(storm STATIC ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode add_dependencies(storm sylvan) add_dependencies(storm resources) add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) From 7bdd85e97fb77ffab93b65d75d2d0fc2e59c03ee Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 18 Feb 2016 00:16:56 +0100 Subject: [PATCH 3/4] add a comment that a file is autogenerated Former-commit-id: 736184f68a9d95281e991b79a76946e26dfd8887 --- storm-version.cpp.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storm-version.cpp.in b/storm-version.cpp.in index 9de4c4481..662f3395e 100644 --- a/storm-version.cpp.in +++ b/storm-version.cpp.in @@ -1,3 +1,5 @@ +//AUTO GENERATED -- DO NOT CHANGE +// TODO resolve issues when placing this in the build order directly. #include "src/utility/storm-version.h" namespace storm { From ac1efc7efdd794029c7678713095f756e2c75a74 Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 18 Feb 2016 00:18:07 +0100 Subject: [PATCH 4/4] minor fix of a superfluous cmake include Former-commit-id: ab663101d24f895243430497a4607f0801fc4030 --- resources/3rdparty/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 2d5309ee5..090c8ff15 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -2,7 +2,6 @@ add_custom_target(resources) add_custom_target(test-resources) if(STORM_SUPPORT_XML_INPUT_FORMATS) - include(ExternalProject) ExternalProject_Add( xercesc SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/xercesc-3.1.2 @@ -59,4 +58,4 @@ ExternalProject_Get_Property(googletest binary_dir) set(GTEST_LIBRARIES ${binary_dir}/libgtest.a ${binary_dir}/libgtest_main.a PARENT_SCOPE) add_dependencies(test-resources googletest) - +