Merge branch 'future' into exact_equation_solver

Former-commit-id: 13f4a09cdd

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")

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

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)

src/CMakeLists.txt

@@ -108,7 +108,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 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})

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 {