From: maier Date: Thu, 1 Nov 2012 21:43:54 +0000 (+0000) Subject: Rename feature TBB to THREADS. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa6e779193bbba94e59cbf7a8b9c304216c31388;p=dealii-svn.git Rename feature TBB to THREADS. Change the default for defined and DEAL_II_WITH_THREADS=OFF. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27301 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/README.CMAKE b/deal.II/README.CMAKE index f06781ef3a..5e7b771078 100644 --- a/deal.II/README.CMAKE +++ b/deal.II/README.CMAKE @@ -188,7 +188,7 @@ CONFIGURATION DEAL_II_WITH_SLEPC Build deal.II with support for SLEPc - DEAL_II_WITH_TBB + DEAL_II_WITH_THREADS Build deal.II with support for tbb. This will enable thread support in deal.II DEAL_II_WITH_TRILINOS diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_threads.cmake similarity index 89% rename from deal.II/cmake/configure/configure_1_tbb.cmake rename to deal.II/cmake/configure/configure_1_threads.cmake index 4d4567c34c..557b3173ac 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -12,14 +12,24 @@ ## ##### + # -# Configuration for tbb support: +# Configuration for thread support in deal.II with the help of the tbb +# library: # +# +# Default to off +# +SET(DEAL_II_WITH_THREADS + OFF # Default to off + CACHE BOOL "Build deal.II with threading support." FORCE + ) + # # Set up genereal threading: -# The macro will be included in CONFIGURE_FEATURE_TBB_EXTERNAL/BUNDLED. +# The macro will be included in CONFIGURE_FEATURE_THREADS_EXTERNAL/BUNDLED. # MACRO(SETUP_THREADING var) FIND_PACKAGE(Threads) @@ -114,7 +124,7 @@ ENDMACRO() # Set up the tbb library: # -MACRO(FEATURE_TBB_FIND_EXTERNAL var) +MACRO(FEATURE_THREADS_FIND_EXTERNAL var) FIND_PACKAGE(TBB) IF(TBB_FOUND) @@ -123,7 +133,7 @@ MACRO(FEATURE_TBB_FIND_EXTERNAL var) ENDMACRO() -MACRO(FEATURE_TBB_CONFIGURE_EXTERNAL var) +MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR}) IF (CMAKE_BUILD_TYPE MATCHES "Debug") @@ -150,7 +160,7 @@ MACRO(FEATURE_TBB_CONFIGURE_EXTERNAL var) ENDMACRO() -MACRO(FEATURE_TBB_CONFIGURE_BUNDLED var) +MACRO(FEATURE_THREADS_CONFIGURE_BUNDLED var) # # Setup threading (before configuring our build...) # and if successfull return TRUE: @@ -177,4 +187,4 @@ MACRO(FEATURE_TBB_CONFIGURE_BUNDLED var) ENDMACRO() -CONFIGURE_FEATURE(TBB) +CONFIGURE_FEATURE(THREADS) diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index a00bae58ca..e764ab6252 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -17,11 +17,11 @@ # # -# This configure script has to be included after configure_tbb. +# This configure script has to be included after configure_threads. # We need some of the variables defined in SETUP_THREADING for # the setup of the bundled boost library (if used) # -IF(NOT FEATURE_TBB_PROCESSED) +IF(NOT FEATURE_THREADS_PROCESSED) MESSAGE(FATAL_ERROR "\n" "Internal build system error:\n" "configure_boost.cmake included before configure_tbb.cmake\n\n"