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

Updated CMakeLists.txt, Cotire Usage is now restricted to Linux/Windows and deactivated on APPLE systems.

tempestpy_adaptions
PBerger 12 years ago
parent
60963aeb12
commit
dbd6c02f6a
1 changed files with 32 additions and 16 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. 16
      CMakeLists.txt

16
CMakeLists.txt
View File

@ -152,6 +152,15 @@ add_executable(storm-tests ${STORM_TEST_SOURCES} ${STORM_TEST_HEADERS})
target_link_libraries(storm ${Boost_LIBRARIES}) target_link_libraries(storm ${Boost_LIBRARIES})
target_link_libraries(storm-tests ${Boost_LIBRARIES}) target_link_libraries(storm-tests ${Boost_LIBRARIES})
set (STORM_USE_COTIRE ON)
if (APPLE)
set(STORM_USE_COTIRE OFF)
endif(APPLE)
# Print Cotire Usage Status
message (STATUS "Using Cotire: ${STORM_USE_COTIRE}")
if (STORM_USE_COTIRE)
# Include Cotire for PCH Generation # Include Cotire for PCH Generation
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/resources/cmake") set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/resources/cmake")
include(cotire) include(cotire)
@ -159,6 +168,7 @@ include(cotire)
cotire(storm) cotire(storm)
target_link_libraries(storm_unity ${Boost_LIBRARIES}) target_link_libraries(storm_unity ${Boost_LIBRARIES})
#cotire(storm-tests) #cotire(storm-tests)
endif()
# Add a target to generate API documentation with Doxygen # Add a target to generate API documentation with Doxygen
if(DOXYGEN_FOUND) if(DOXYGEN_FOUND)
@ -187,12 +197,16 @@ endif(GTEST_INCLUDE_DIR)
if (LOG4CPLUS_INCLUDE_DIR) if (LOG4CPLUS_INCLUDE_DIR)
include_directories(${LOG4CPLUS_INCLUDE_DIR}) include_directories(${LOG4CPLUS_INCLUDE_DIR})
target_link_libraries(storm ${LOG4CPLUS_LIBRARIES}) target_link_libraries(storm ${LOG4CPLUS_LIBRARIES})
if (STORM_USE_COTIRE)
target_link_libraries(storm_unity ${LOG4CPLUS_LIBRARIES}) target_link_libraries(storm_unity ${LOG4CPLUS_LIBRARIES})
endif(STORM_USE_COTIRE)
target_link_libraries(storm-tests ${LOG4CPLUS_LIBRARIES}) target_link_libraries(storm-tests ${LOG4CPLUS_LIBRARIES})
# On Linux, we have to link against librt # On Linux, we have to link against librt
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
target_link_libraries(storm rt) target_link_libraries(storm rt)
if (STORM_USE_COTIRE)
target_link_libraries(storm_unity rt) target_link_libraries(storm_unity rt)
endif(STORM_USE_COTIRE)
target_link_libraries(storm-tests rt) target_link_libraries(storm-tests rt)
endif(UNIX AND NOT APPLE) endif(UNIX AND NOT APPLE)
endif(LOG4CPLUS_INCLUDE_DIR) endif(LOG4CPLUS_INCLUDE_DIR)
@ -200,7 +214,9 @@ endif(LOG4CPLUS_INCLUDE_DIR)
if (THREADS_FOUND) if (THREADS_FOUND)
include_directories(${THREADS_INCLUDE_DIRS}) include_directories(${THREADS_INCLUDE_DIRS})
target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT})
if (STORM_USE_COTIRE)
target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT})
endif(STORM_USE_COTIRE)
target_link_libraries(storm-tests ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(storm-tests ${CMAKE_THREAD_LIBS_INIT})
endif(THREADS_FOUND) endif(THREADS_FOUND)

Write Preview
Loading…
Cancel
Save