Browse Source

Modified CmakeLists.txt to actually also link the libraries of TBB if requested. Included custom build of TBB for Mac OS using Apple clang 4.2 (based on clang 3.2).

tempestpy_adaptions
dehnert 12 years ago
parent
commit
e2f95e065f
  1. 11
      CMakeLists.txt
  2. BIN
      resources/3rdparty/tbb41_20130314_merged-win-lin-mac/lib/intel64/clang3.2/libtbb.dylib
  3. BIN
      resources/3rdparty/tbb41_20130314_merged-win-lin-mac/lib/intel64/clang3.2/libtbbmalloc.dylib

11
CMakeLists.txt

@ -138,8 +138,10 @@ include_directories("${PROJECT_SOURCE_DIR}/src")
set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb41_20130314_merged-win-lin-mac/")
if(MSVC)
set(ENV{TBB_ARCH_PLATFORM} "intel64/vc11")
else()
elseif(CMAKE_COMPILER_IS_GNUCC)
set(ENV{TBB_ARCH_PLATFORM} "intel64/gcc4.4")
else(CLANG)
set(ENV{TBB_ARCH_PLATFORM} "intel64/clang3.2")
endif()
# Add the resources/cmake folder to Module Search Path for FindTBB.cmake
@ -193,6 +195,11 @@ add_executable(storm-tests ${STORM_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${S
target_link_libraries(storm ${Boost_LIBRARIES})
target_link_libraries(storm-tests ${Boost_LIBRARIES})
if (USE_INTELTBB)
target_link_libraries(storm tbb tbbmalloc)
target_link_libraries(storm-tests tbb tbbmalloc)
endif(USE_INTELTBB)
set (STORM_USE_COTIRE ON)
if (APPLE)
set(STORM_USE_COTIRE OFF)
@ -215,8 +222,6 @@ if (STORM_USE_COTIRE)
#cotire(storm-tests)
endif()
# Add a target to generate API documentation with Doxygen
if(DOXYGEN_FOUND)
set(CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc")

BIN
resources/3rdparty/tbb41_20130314_merged-win-lin-mac/lib/intel64/clang3.2/libtbb.dylib

BIN
resources/3rdparty/tbb41_20130314_merged-win-lin-mac/lib/intel64/clang3.2/libtbbmalloc.dylib

Loading…
Cancel
Save