From: Matthias Maier Date: Sun, 15 Dec 2013 15:23:42 +0000 (+0000) Subject: Reenable TBB_DO_ASSERT=1 when configuring tbb X-Git-Tag: v8.2.0-rc1~1188 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef20b2903c7db8d91b698bf424e902bbf2adc5e6;p=dealii.git Reenable TBB_DO_ASSERT=1 when configuring tbb git-svn-id: https://svn.dealii.org/trunk@32018 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake index de3c791a65..fb4cce0676 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -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() #