From: ddzama <ddzama@opencascade.com>
Date: Mon, 3 Oct 2022 07:34:39 +0000 (+0300)
Subject: 0033152: Fix searching tbb in 3rdparty directory.
X-Git-Tag: V7_7_0~25
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=13f5da81ad1f77e7a4e564c5ed90fe5512465498;p=occt.git

0033152: Fix searching tbb in 3rdparty directory.

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.
---

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index 4a060665f6..9fd3ec4cfb 100644
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -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}")