From c15b9b7fc83067ad0fbe29af7eac74fdc0b4175c Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 17 Mar 2021 18:08:41 +0300 Subject: [PATCH] Porting to Paraview 5.9: adapt TBB detection procedure to correctly work with FindTBB.cmake that comes from rkcommon --- cmake/FindSalomeTBB.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/FindSalomeTBB.cmake b/cmake/FindSalomeTBB.cmake index 6e41f63..1060241 100644 --- a/cmake/FindSalomeTBB.cmake +++ b/cmake/FindSalomeTBB.cmake @@ -30,7 +30,15 @@ ELSEIF(TBB_IMPORTED_TARGETS) #Config mode SET(TBB_LIBRARIES ${TBB_IMPORTED_TARGETS}) ELSE() - MESSAGE(FATAL_ERROR "Can't find tbb installation!") + IF(TARGET TBB::tbb) + LIST(APPEND TBB_LIBRARIES TBB::tbb) + ENDIF() + IF(TARGET TBB::tbbmalloc) + LIST(APPEND TBB_LIBRARIES TBB::tbbmalloc) + ENDIF() + IF(NOT TBB_LIBRARIES) + MESSAGE(FATAL_ERROR "Can't find tbb installation!") + ENDIF() ENDIF() IF(TBB_FOUND) -- 2.30.2