From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sat, 14 Dec 2013 13:20:21 +0000 (+0000)
Subject: take over r32006
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afbdb4743943a1c70f1263b8a1a3248693aae2c;p=dealii-svn.git

take over r32006

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@32008 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt b/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
index 628303a82b..9604dad1b6 100644
--- a/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
+++ b/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
@@ -77,5 +77,3 @@ DEAL_II_ADD_DEFINITIONS(obj_tbb "USE_PTHREAD")
 IF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   DEAL_II_ADD_DEFINITIONS(obj_tbb "DO_ITT_NOTIFY")
 ENDIF()
-
-# TBB_USE_DEBUG
diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake
index da49c2eb24..de3c791a65 100644
--- a/deal.II/cmake/configure/configure_1_threads.cmake
+++ b/deal.II/cmake/configure/configure_1_threads.cmake
@@ -156,9 +156,7 @@ MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL)
 
   IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     IF(TBB_WITH_DEBUG_LIB)
-      LIST(APPEND DEAL_II_DEFINITIONS_DEBUG
-        "TBB_USE_DEBUG=1" "TBB_DO_ASSERT=1"
-        )
+      LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "TBB_USE_DEBUG")
     ENDIF()
   ENDIF()
 
@@ -193,9 +191,7 @@ MACRO(FEATURE_THREADS_CONFIGURE_BUNDLED)
   # Add some definitions to use the header files in debug mode:
   #
   IF (CMAKE_BUILD_TYPE MATCHES "Debug")
-    LIST(APPEND DEAL_II_DEFINITIONS_DEBUG
-      "TBB_DO_DEBUG=1" "TBB_DO_ASSERT=1"
-      )
+    LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "TBB_USE_DEBUG")
   ENDIF()
 
   #