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 c0b1b0544..48428d7cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,7 +113,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})