From 0f50bd7851da350e0745124a23492707b81b19ea Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 1 Nov 2012 23:05:47 +0000 Subject: [PATCH] Rename the bundled feature TBB to THREADS as well git-svn-id: https://svn.dealii.org/branches/branch_cmake@27305 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 657790f618..3ab83a3989 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -69,14 +69,14 @@ ENDIF() # IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN" AND NOT CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(FEATURE_TBB_HAVE_BUNDLED TRUE) + SET(FEATURE_THREADS_HAVE_BUNDLED TRUE) SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb30_104oss") - OPTION(DEAL_II_FORCE_BUNDLED_TBB + OPTION(DEAL_II_FORCE_BUNDLED_THREADS "Always use the bundled tbb library instead of an external one." OFF) ENDIF() -IF(FEATURE_TBB_BUNDLED_CONFIGURED) +IF(FEATURE_THREADS_BUNDLED_CONFIGURED) INSTALL(DIRECTORY ${TBB_FOLDER}/include/tbb DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled COMPONENT library -- 2.39.5