From 9e42736f86ca89f5bc7e3b6c480b3e48993028c3 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 19 Sep 2012 10:14:33 +0000 Subject: [PATCH] Unfortunately, we need to disable this warnings also for the header files. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26498 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/cmake/configure/configure_1_tbb.cmake | 8 ++++++++ deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake index 72041b0d43..4cd93ee4a9 100644 --- a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake @@ -130,6 +130,14 @@ MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var) # and if successfull return TRUE: SETUP_THREADING(${var}) + + # + # We have to disable a bunch of warnings: + # + ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-parentheses") + ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-long-long") + + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include ) diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt index 2463583a3e..df41682ec5 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt +++ b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt @@ -68,14 +68,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") ADD_FLAGS(obj_tbb_COMPILE_FLAGS "-DUSE_WINTHREAD") ENDIF() - -# -# We have to disable a bunch of warnings: -# -ENABLE_IF_SUPPORTED(obj_tbb_COMPILE_FLAGS "-Wno-parentheses") -ENABLE_IF_SUPPORTED(obj_tbb_COMPILE_FLAGS "-Wno-long-long") - - SET_TARGET_PROPERTIES(obj_tbb PROPERTIES COMPILE_FLAGS ${obj_tbb_COMPILE_FLAGS}) -- 2.39.5