From 5351d220a4f7aa1e5b9c06fad7cb2d16b9004f58 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 18 Sep 2012 21:44:52 +0000 Subject: [PATCH] Bugfix: Only disable warnings for the source files that actually need it. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26487 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/configure/configure_1_tbb.cmake | 3 --- .../tbb/tbb30_104oss/src/CMakeLists.txt | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake index 54c10d8a34..72041b0d43 100644 --- a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake @@ -130,9 +130,6 @@ MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var) # and if successfull return TRUE: SETUP_THREADING(${var}) - # We have to disable a bunch of warnings: - ENABLE_IF_AVAILABLE(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 206617c5f0..1bf7f8bc31 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt +++ b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt @@ -52,19 +52,30 @@ ADD_LIBRARY(obj_tbb OBJECT ${src_tbb}) # # Add necessary definitions: # - IF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") - SET(TBB_COMPILE_FLAGS "${TBB_COMPILE_FLAGS} -DDO_ITT_NOTIFY") + ADD_FLAGS(TBB_COMPILE_FLAGS "-DDO_ITT_NOTIFY") ENDIF() IF(CMAKE_BUILD_TYPE MATCHES "Debug") - SET(TBB_COMPILE_FLAGS "${TBB_COMPILE_FLAGS} -DTBB_USE_DEBUG") + ADD_FLAGS(TBB_COMPILE_FLAGS "-DTBB_USE_DEBUG") ENDIF() IF(DEAL_II_USE_MT_POSIX) - SET(TBB_COMPILE_FLAGS "${TBB_COMPILE_FLAGS} -DUSE_PTHREAD") + ADD_FLAGS(TBB_COMPILE_FLAGS "-DUSE_PTHREAD") +ENDIF() + +IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + ADD_FLAGS(TBB_COMPILE_FLAGS "-DUSE_WINTHREAD") ENDIF() + +# +# We have to disable a bunch of warnings: +# +ENABLE_IF_AVAILABLE(TBB_COMPILE_FLAGS "-Wno-parentheses") +ENABLE_IF_AVAILABLE(TBB_COMPILE_FLAGS "-Wno-long-long") + + SET_TARGET_PROPERTIES(obj_tbb PROPERTIES COMPILE_FLAGS ${TBB_COMPILE_FLAGS}) -- 2.39.5