]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: FindDEAL_II_TBB: do not use optimized/debug/general keywords
authorMatthias Maier <tamiko@43-1.org>
Fri, 3 Mar 2023 20:49:20 +0000 (14:49 -0600)
committerMatthias Maier <tamiko@43-1.org>
Fri, 17 Mar 2023 12:44:54 +0000 (07:44 -0500)
cmake/modules/FindDEAL_II_TBB.cmake

index c91b310d0981a6dbc811932d417daa855300be6a..154badf224a7f2d745ca435296626f6449009a18 100644 (file)
@@ -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
   )

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.