]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Build TBB directly into deal.II
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 13 Sep 2012 16:17:41 +0000 (16:17 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 13 Sep 2012 16:17:41 +0000 (16:17 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26357 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_threads.cmake

index 71393156fbb1f5b4b9453dffbce2400a9c4cc15d..7217e87ae25cdc8e9cf8ca2e6f7b0bb74be620d2 100644 (file)
@@ -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."
index 4ff92808b8551fd4eee3838ec5afcaf4b5a395fe..0d060eac4dcda0282d19ab977009638e87279485 100644 (file)
@@ -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
+    $<TARGET_OBJECTS:obj_tbb>
+    )
 
-  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})

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.