From: ski Date: Wed, 3 Feb 2016 13:37:52 +0000 (+0300) Subject: 0027095: Configuration, CMake - configuration process finds tcl folder with incorrect... X-Git-Tag: V7_0_0rc~64 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=78934a4f8dffa012445cfd34809a81aa16daa9d5;p=occt-copy.git 0027095: Configuration, CMake - configuration process finds tcl folder with incorrect bitness for 32bit case New pattern for seeking of 3rdparty products was added. --- diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake index 9a011ed4b4..f352096672 100644 --- a/adm/cmake/occt_macros.cmake +++ b/adm/cmake/occt_macros.cmake @@ -120,6 +120,7 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT) 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}") list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}") + list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}") list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+") list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")