]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reenable TBB_DO_ASSERT=1 when configuring tbb
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 15 Dec 2013 15:23:42 +0000 (15:23 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 15 Dec 2013 15:23:42 +0000 (15:23 +0000)
git-svn-id: https://svn.dealii.org/trunk@32018 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_1_threads.cmake

index de3c791a6579786e23d2d12d9ae5e3a556e9703f..fb4cce06760bec6f1e724634045007a381e666ca 100644 (file)
@@ -156,7 +156,8 @@ 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")
+      LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "TBB_USE_DEBUG" "TBB_DO_ASSERT=1")
+      LIST(APPEND DEAL_II_USER_DEFINITIONS_DEBUG "TBB_USE_DEBUG" "TBB_DO_ASSERT=1")
     ENDIF()
   ENDIF()
 
@@ -191,7 +192,8 @@ 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_USE_DEBUG")
+    LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "TBB_USE_DEBUG" "TBB_DO_ASSERT=1")
+    LIST(APPEND DEAL_II_USER_DEFINITIONS_DEBUG "TBB_USE_DEBUG" "TBB_DO_ASSERT=1")
   ENDIF()
 
   #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.