]> OCCT Git - occt.git/commitdiff
0033152: Fix searching tbb in 3rdparty directory.
authorddzama <ddzama@opencascade.com>
Mon, 3 Oct 2022 07:34:39 +0000 (10:34 +0300)
committersmoskvin <smoskvin@opencascade.com>
Mon, 31 Oct 2022 15:01:27 +0000 (18:01 +0300)
Currently directory containing tbb 3rdparty installation should match the template tbb*.
But after using oneTbb of version 2021.5 standard installation directory is onetbb*.
So, for this 3rdparty modify searching template.

adm/cmake/occt_macros.cmake

index 4a060665f698c73db6995d3fc3c8011c93e0137b..9fd3ec4cfbcf39a36b16bec27b5750f36ba0db93 100644 (file)
@@ -160,6 +160,8 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
     string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
     list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
+  elseif ("${lower_PRODUCT_NAME}" STREQUAL "tbb")
+    list (APPEND SEARCH_TEMPLATES "^.*${lower_PRODUCT_NAME}.*")
   else()
     list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
     list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")