From 07f9e26607f6a41307651dc217dfaf218d604250 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 14 Sep 2012 20:44:48 +0000 Subject: [PATCH] Bugfix: configure threads before tbb... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26392 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 14 +++++++------- .../contrib/cmake/configure/configure_tbb.cmake | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index c22584aab8..5ce11706d0 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -84,7 +84,7 @@ OPTION(DEAL_II_FEATURE_AUTODETECTION "Enables feature autodetection. This will automatically overwrite all DEAL_II_WITH_<...> toggles depending on whether they can be supported or not." - OFF) + ON) OPTION(DEAL_II_WITH_BLAS "Build deal.II with support for BLAS." @@ -96,7 +96,7 @@ OPTION(DEAL_II_WITH_FUNCTIONPARSER OPTION(DEAL_II_WITH_LAPACK "Build deal.II with support for LAPACK." - ON) + OFF) OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." @@ -116,7 +116,7 @@ OPTION(DEAL_II_WITH_TBB OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK." - ON) + OFF) OPTION(DEAL_II_WITH_ZLIB "Build deal.II with support for zlib." @@ -136,19 +136,19 @@ OPTION(DEAL_II_ALLOW_CONTRIB OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER "Always use the bundled functionparser library instead of an external one." - OFF) + ON) OPTION(DEAL_II_FORCE_CONTRIB_BOOST "Always use the bundled boost library instead of an external one." - OFF) + ON) 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." - OFF) + ON) # # Compatibility support: diff --git a/deal.II/contrib/cmake/configure/configure_tbb.cmake b/deal.II/contrib/cmake/configure/configure_tbb.cmake index 201263e353..26143962e9 100644 --- a/deal.II/contrib/cmake/configure/configure_tbb.cmake +++ b/deal.II/contrib/cmake/configure/configure_tbb.cmake @@ -123,6 +123,10 @@ MACRO(CONFIGURE_FEATURE_TBB_CONTRIB var) # Add tbb directly to the object files of deal.II # + # Setup threading (before configurating our build...) + # and if successfull return TRUE: + SETUP_THREADING(${var}) + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include ) @@ -132,9 +136,6 @@ MACRO(CONFIGURE_FEATURE_TBB_CONTRIB var) LIST(APPEND deal_ii_additional_object_files $ ) - - # Setup threading and if successfull return TRUE: - SETUP_THREADING(${var}) ENDMACRO() -- 2.39.5