Search libraries only in explicitly pointed locations

Signed-off-by: Isaev, Ilya <[email protected]>
uxlfoundation · Sep 27, 2023 · 4e1e82a · 4e1e82a
1 parent fd1590c
commit 4e1e82a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cmake/config_generation.cmake b/cmake/config_generation.cmake
@@ -92,13 +92,15 @@ set(_tbbbind_bin_version ${tbb_gen_cfg_TBBBIND_BINARY_VERSION})
                 NAMES \${_tbb_component}\${_bin_version}.dll
                 PATHS \${_tbb_root}
                 PATH_SUFFIXES \"redist/\${_tbb_intel_arch}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\" \"bin\"
+                NO_DEFAULT_PATH
             )
 
             if (EXISTS \"\${_tbb_debug_lib}\")
                 find_file(_tbb_debug_dll
                     NAMES \${_tbb_component}\${_bin_version}_debug.dll
                     PATHS \${_tbb_root}
                     PATH_SUFFIXES \"redist/\${_tbb_intel_arch}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\" \"bin\"
+                    NO_DEFAULT_PATH
                 )
             endif()
 ")

diff --git a/cmake/templates/TBBConfig.cmake.in b/cmake/templates/TBBConfig.cmake.in
@@ -65,13 +65,15 @@ foreach (_tbb_component ${TBB_FIND_COMPONENTS})
         NAMES @TBB_LIB_PREFIX@${_tbb_component}${_bin_version}.@TBB_LIB_EXT@
         PATHS ${_tbb_root}
         PATH_SUFFIXES "@TBB_LIB_REL_PATH@/${_tbb_intel_arch}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}" "@TBB_LIB_REL_PATH@"
+        NO_DEFAULT_PATH
     )
 
     if (NOT TBB_FIND_RELEASE_ONLY)
         find_library(_tbb_debug_lib
             NAMES @TBB_LIB_PREFIX@${_tbb_component}${_bin_version}_debug.@TBB_LIB_EXT@
             PATHS ${_tbb_root}
             PATH_SUFFIXES "@TBB_LIB_REL_PATH@/${_tbb_intel_arch}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}" "@TBB_LIB_REL_PATH@"
+            NO_DEFAULT_PATH
         )
     endif()