mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Modules/Compiler: Prefer companion tools adjacent to compiler

Browse Source 
Previously a versioned name in a later search path was preferred
over an unversioned name adjacent to the compiler.  Consider all
names in each directory before moving to the next directory.
This commit is contained in:
Brad King
2026-09-15 08:46:25 -04:00
parent ccf42522b8
commit 047c617a77
6 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/Clang-FindBinUtils.cmake
+3
View File
@@ -30,6 +30,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar"
HINTS ${__clang_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "LLVM archiver"
@@ -44,6 +45,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib"
HINTS ${__clang_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "Generate index for LLVM archive"
@@ -64,6 +66,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_CLANG_SCAN_DEPS
"clang-scan-deps${__version_x}"
"clang-scan-deps"
HINTS ${__clang_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "`clang-scan-deps` dependency scanner"
Modules/Compiler/Diab-FindBinUtils.cmake
+1
View File
@@ -10,6 +10,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
NAMES
dar
HINTS ${__diab_path}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "Diab Archiver"
Modules/Compiler/GNU-FindBinUtils.cmake
+2
View File
@@ -22,6 +22,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for the GCC compiler"
@@ -36,6 +37,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option for the GCC compiler"
Modules/Compiler/IntelLLVM-FindBinUtils.cmake
+2
View File
@@ -32,6 +32,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar-${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar"
HINTS ${__intel_llvm_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "LLVM archiver"
@@ -45,6 +46,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib-${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib"
HINTS ${__intel_llvm_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "Generate index for LLVM archive"
Modules/Compiler/LCC-FindBinUtils.cmake
+2
View File
@@ -21,6 +21,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for the GCC compiler"
@@ -34,6 +35,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option for the GCC compiler"
Modules/Compiler/Tasking-FindBinUtils.cmake
+1
View File
@@ -18,6 +18,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
ararc
arpcp
HINTS ${__tasking_hints}
NAMES_PER_DIR
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
DOC "Tasking Archiver"