From e6a9075ed5a33c9f69180ca45737c2006751bca2 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 14 Dec 2013 13:18:09 +0000 Subject: [PATCH] Bugfix: Do not define TBB_DO_ASSERT=1. This is an internal definition; the original build system does not define it for building the default library, so we shouldn't do either. git-svn-id: https://svn.dealii.org/trunk@32006 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt | 2 -- deal.II/cmake/configure/configure_1_threads.cmake | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) 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() # -- 2.39.5