]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Only disable warnings for the source files that actually need it.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 21:44:52 +0000 (21:44 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 21:44:52 +0000 (21:44 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26487 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/configure/configure_1_tbb.cmake
deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt

index 54c10d8a3425c05d8e8a3c2efd07e61ce6c6af67..72041b0d43afd5461c76604ac4f9ebfbc571aa31 100644 (file)
@@ -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
     )
index 206617c5f0c177175a887f2a551b292d6ca1dd29..1bf7f8bc3139c1848fe83a6f5e88c437c246ed23 100644 (file)
@@ -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})
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.