@ -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/" )
set ( TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb41_20130314_merged-win-lin-mac/" )
if ( MSVC )
if ( MSVC )
set ( ENV{TBB_ARCH_PLATFORM} "intel64/vc11" )
set ( ENV{TBB_ARCH_PLATFORM} "intel64/vc11" )
else ( )
elseif ( CMAKE_COMPILER_IS_GNUCC )
set ( ENV{TBB_ARCH_PLATFORM} "intel64/gcc4.4" )
set ( ENV{TBB_ARCH_PLATFORM} "intel64/gcc4.4" )
else ( CLANG )
set ( ENV{TBB_ARCH_PLATFORM} "intel64/clang3.2" )
endif ( )
endif ( )
# A d d t h e r e s o u r c e s / c m a k e f o l d e r t o M o d u l e S e a r c h P a t h f o r F i n d T B B . c m a k e
# A d d t h e r e s o u r c e s / c m a k e f o l d e r t o M o d u l e S e a r c h P a t h f o r F i n d T B B . c m a k e
@ -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 ${ Boost_LIBRARIES } )
target_link_libraries ( storm-tests ${ 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 )
set ( STORM_USE_COTIRE ON )
if ( APPLE )
if ( APPLE )
set ( STORM_USE_COTIRE OFF )
set ( STORM_USE_COTIRE OFF )
@ -215,8 +222,6 @@ if (STORM_USE_COTIRE)
# cotire ( storm-tests )
# cotire ( storm-tests )
endif ( )
endif ( )
# A d d a t a r g e t t o g e n e r a t e A P I d o c u m e n t a t i o n w i t h D o x y g e n
# A d d a t a r g e t t o g e n e r a t e A P I d o c u m e n t a t i o n w i t h D o x y g e n
if ( DOXYGEN_FOUND )
if ( DOXYGEN_FOUND )
set ( CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc" )
set ( CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc" )