Salome HOME
projects
/
tools
/
configuration.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5ec2cd
)
Porting to Paraview 5.9: adapt TBB detection procedure to correctly work with FindTBB...
author
vsr
<vsr@opencascade.com>
Wed, 17 Mar 2021 15:08:41 +0000
(18:08 +0300)
committer
vsr
<vsr@opencascade.com>
Wed, 17 Mar 2021 15:08:41 +0000
(18:08 +0300)
cmake/FindSalomeTBB.cmake
patch
|
blob
|
history
diff --git
a/cmake/FindSalomeTBB.cmake
b/cmake/FindSalomeTBB.cmake
index 6e41f63e8c26d91ae6ceeba0ab12dae146274a8a..1060241c1e7527227198733a50c3a10a3a094966 100644
(file)
--- 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()
#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)
ENDIF()
IF(TBB_FOUND)