sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'future' into monolithic-dft 

Former-commit-id: 23566a3747
tempestpy_adaptions
sjunges 9 years ago
parent
8eeb62e11e 559142919d
commit
6677316c57
3 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      CMakeLists.txt
  2. 2
      resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt
  3. 2
      src/CMakeLists.txt

6
CMakeLists.txt
View File

@ -580,7 +580,7 @@ endif()
## Log4CPlus ## 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_LOGGINGSERVER OFF)
set(LOG4CPLUS_BUILD_TESTING OFF) set(LOG4CPLUS_BUILD_TESTING OFF)
set(LOG4CPLUS_USE_UNICODE 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_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 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) if (UNIX AND NOT APPLE)
list(APPEND STORM_LINK_LIBRARIES rt) list(APPEND STORM_LINK_LIBRARIES rt)
endif(UNIX AND NOT APPLE) 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 a header file to pass the storm version to the source code
configure_file ( configure_file (
"${PROJECT_SOURCE_DIR}/storm-version.cpp.in" "${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") set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp")

2
resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt
View File

@ -35,7 +35,7 @@ if(NOT LOG4CPLUS_SINGLE_THREADED)
message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
endif(NOT LOG4CPLUS_SINGLE_THREADED) 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) if (WIN32)
set (UNICODE_DEFAULT ON) set (UNICODE_DEFAULT ON)

2
src/CMakeLists.txt
View File

@ -113,7 +113,7 @@ endif(ADDITIONAL_LINK_DIRS)
## All link_directories() calls MUST be made before this point # ## 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 sylvan)
add_dependencies(storm resources) add_dependencies(storm resources)
add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})

Write Preview
Loading…
Cancel
Save