From e02732bd795cdc095bd2d220d5d262c3b3dd3d47 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 16 Apr 2013 08:09:23 +0000 Subject: [PATCH] Switch back to bundled tbb version 3.0 for now. git-svn-id: https://svn.dealii.org/trunk@29297 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 2ea64b407b..dde445cb75 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -74,9 +74,10 @@ IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN") OPTION(DEAL_II_FORCE_BUNDLED_THREADS "Always use the bundled tbb library instead of an external one." OFF) - SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb41_20130401oss") + SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb30_104oss") ENDIF() + IF(FEATURE_THREADS_BUNDLED_CONFIGURED) INSTALL(DIRECTORY ${TBB_FOLDER}/include/tbb DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled -- 2.39.5