From 659ab01124fb4af7c8e3f1795cf4c86e1ab5c8cb Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 3 Mar 2023 14:49:20 -0600 Subject: [PATCH] CMake: FindDEAL_II_TBB: do not use optimized/debug/general keywords --- cmake/modules/FindDEAL_II_TBB.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindDEAL_II_TBB.cmake b/cmake/modules/FindDEAL_II_TBB.cmake index c91b310d09..154badf224 100644 --- a/cmake/modules/FindDEAL_II_TBB.cmake +++ b/cmake/modules/FindDEAL_II_TBB.cmake @@ -20,7 +20,6 @@ # # TBB_LIBRARIES # TBB_INCLUDE_DIRS -# TBB_WITH_DEBUGLIB # TBB_WITH_ONEAPI # TBB_VERSION # TBB_VERSION_MAJOR @@ -51,10 +50,12 @@ deal_ii_find_library(TBB_DEBUG_LIBRARY PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib ) if(NOT TBB_DEBUG_LIBRARY MATCHES "-NOTFOUND") - set(TBB_WITH_DEBUGLIB TRUE) - set(_libraries debug TBB_DEBUG_LIBRARY optimized TBB_LIBRARY) + set(_libraries + LIBRARIES_RELEASE REQUIRED TBB_LIBRARY + LIBRARIES_DEBUG REQUIRED TBB_DEBUG_LIBRARY + ) else() - set(_libraries TBB_LIBRARY) + set(_libraries LIBRARIES REQUIRED TBB_LIBRARY) endif() # @@ -115,7 +116,7 @@ else() endif() process_feature(TBB - LIBRARIES REQUIRED ${_libraries} + ${_libraries} INCLUDE_DIRS REQUIRED TBB_INCLUDE_DIR CLEAR TBB_DEBUG_LIBRARY TBB_LIBRARY TBB_INCLUDE_DIR ) -- 2.39.5