From: Matthias Maier Date: Thu, 17 Oct 2013 08:00:22 +0000 (+0000) Subject: Bugfix: It is safe to export TBB_IMPLEMENT_CXX1X and the user should do this, too X-Git-Tag: v8.1.0~570^2~33 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1542f35e1df7941c3b993c44cf22b936330bd2bf;p=dealii.git Bugfix: It is safe to export TBB_IMPLEMENT_CXX1X and the user should do this, too git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31275 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 88c0737d5f..52e16e0ab8 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -172,9 +172,9 @@ MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL) NOT DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU" ) LIST(APPEND DEAL_II_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") + LIST(APPEND DEAL_II_USER_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") ENDIF() - SETUP_THREADING() ENDMACRO() @@ -208,6 +208,7 @@ MACRO(FEATURE_THREADS_CONFIGURE_BUNDLED) NOT DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU" ) LIST(APPEND DEAL_II_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") + LIST(APPEND DEAL_II_USER_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") ENDIF() #