From: maier Date: Tue, 18 Sep 2012 21:52:36 +0000 (+0000) Subject: Small refactoring X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36823a7d005cd32bc58a5573da69a90111a39efb;p=dealii-svn.git Small refactoring git-svn-id: https://svn.dealii.org/branches/branch_cmake@26488 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt index 1bf7f8bc31..5aeb1c1f72 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt +++ b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt @@ -53,29 +53,29 @@ ADD_LIBRARY(obj_tbb OBJECT ${src_tbb}) # Add necessary definitions: # IF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") - ADD_FLAGS(TBB_COMPILE_FLAGS "-DDO_ITT_NOTIFY") + ADD_FLAGS(obj_tbb_COMPILE_FLAGS "-DDO_ITT_NOTIFY") ENDIF() IF(CMAKE_BUILD_TYPE MATCHES "Debug") - ADD_FLAGS(TBB_COMPILE_FLAGS "-DTBB_USE_DEBUG") + ADD_FLAGS(obj_tbb_COMPILE_FLAGS "-DTBB_USE_DEBUG") ENDIF() IF(DEAL_II_USE_MT_POSIX) - ADD_FLAGS(TBB_COMPILE_FLAGS "-DUSE_PTHREAD") + ADD_FLAGS(obj_tbb_COMPILE_FLAGS "-DUSE_PTHREAD") ENDIF() IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - ADD_FLAGS(TBB_COMPILE_FLAGS "-DUSE_WINTHREAD") + ADD_FLAGS(obj_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") +ENABLE_IF_AVAILABLE(obj_tbb_COMPILE_FLAGS "-Wno-parentheses") +ENABLE_IF_AVAILABLE(obj_tbb_COMPILE_FLAGS "-Wno-long-long") SET_TARGET_PROPERTIES(obj_tbb PROPERTIES - COMPILE_FLAGS ${TBB_COMPILE_FLAGS}) + COMPILE_FLAGS ${obj_tbb_COMPILE_FLAGS})