From: Matthias Maier Date: Thu, 13 Sep 2012 16:17:41 +0000 (+0000) Subject: Build TBB directly into deal.II X-Git-Tag: v8.0.0~1079^2~875 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa434986888117748df2cfb0d97533f3ac847236;p=dealii.git Build TBB directly into deal.II git-svn-id: https://svn.dealii.org/branches/branch_cmake@26357 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 71393156fb..7217e87ae2 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -85,7 +85,7 @@ OPTION(DEAL_II_WITH_NETCDF OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." - OFF) + ON) OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK, BLAS and LAPACK." @@ -117,7 +117,7 @@ OPTION(DEAL_II_FORCE_CONTRIB_BOOST OPTION(DEAL_II_FORCE_CONTRIB_TBB "Always use the bundled tbb library instead of an external one." - OFF) + ON) OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK "Always use the bundled umfpack library instead of an external one." diff --git a/deal.II/contrib/cmake/configure/configure_threads.cmake b/deal.II/contrib/cmake/configure/configure_threads.cmake index 4ff92808b8..0d060eac4d 100644 --- a/deal.II/contrib/cmake/configure/configure_threads.cmake +++ b/deal.II/contrib/cmake/configure/configure_threads.cmake @@ -88,19 +88,20 @@ ENDIF() IF(DEAL_II_FORCE_CONTRIB_TBB OR NOT TBB_FOUND) - # TODO: The same as with everything else... + # + # Add tbb directly to the object files of deal.II + # - SET(libtbb_directory "tbb30_104oss") + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include + ) - # compile and link the contrib tbb library: - ADD_SUBDIRECTORY(contrib/tbb) + ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/src) - # set TBB_LIBRARY and TBB_DEBUG_LIBRARY to the full path of the - # _installed_ library location: + LIST(APPEND deal_ii_additional_object_files + $ + ) - SET(TBB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/contrib/tbb/${libtbb_directory}/include) - SET(TBB_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libtbb.so) - SET(TBB_DEBUG_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libtbb_debug.so) ENDIF() INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR})