From ca44b9da2bd86c3fe2f4bcb65124a1e983ef6f50 Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 24 Mar 2013 10:53:56 +0000 Subject: [PATCH] CMake: Bugfix in FindTBB.cmake git-svn-id: https://svn.dealii.org/trunk@29011 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindTBB.cmake | 4 ++-- deal.II/cmake/setup_finalize.cmake | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake index f909420e6e..cb603dadb8 100644 --- a/deal.II/cmake/modules/FindTBB.cmake +++ b/deal.II/cmake/modules/FindTBB.cmake @@ -55,9 +55,9 @@ IF(TBB_FOUND) IF(NOT TBB_DEBUG_LIBRARY MATCHES "-NOTFOUND") SET(TBB_WITH_DEBUGLIB TRUE) - SET(TBB_LIBRARIES debug ${TBB_LIBARY} optimized ${TBB_LIBRARY}) + SET(TBB_LIBRARIES debug ${TBB_DEBUG_LIBRARY} optimized ${TBB_LIBRARY}) ELSE() - SET(TBB_LIBRARIES ${TBB_LIBARY}) + SET(TBB_LIBRARIES ${TBB_LIBRARY}) ENDIF() SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 77af8b2058..7068004b07 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -138,6 +138,8 @@ FOREACH(_var ${_features}) _var2 MATCHES "^${_feature}_CXX_(COMPILER|COMPILE_FLAGS|LINK_FLAGS|LIBRARIES|INCLUDE_PATH)$" OR # Boost: ( _feature MATCHES "BOOST" AND _var2 MATCHES "^Boost(_LIBRARIES|_INCLUDE_DIRS)$" ) OR + # TBB: + ( _feature MATCHES "THREADS" AND _var2 MATCHES "^TBB(_LIBRARIES|_INCLUDE_DIRS)$" ) OR # Generic: ( (NOT _var2 MATCHES "^(MPI|Boost)") AND _var2 MATCHES "^${_feature}_(INCLUDE_DIRS|LIBRARIES|LINKER_FLAGS)$" ) -- 2.39.5