diff options
| author | Craig Scott <craig.scott@crascit.com> | 2021-03-24 05:35:49 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2021-03-24 05:35:49 (GMT) |
| commit | f226a1678fe27817649ec536ad2923a98a7646a3 (patch) | |
| tree | 4dcd4542800405850f46d1efafc7a9c260bc5afb /Modules/CMakeDetermineCompiler.cmake | |
| parent | a6a52563955a5a42e1fec856d65479444ba5fbdc (diff) | |
| parent | 88060f471766222c54a080900f73abf29586a6f4 (diff) | |
| download | CMake-f226a1678fe27817649ec536ad2923a98a7646a3.zip CMake-f226a1678fe27817649ec536ad2923a98a7646a3.tar.gz CMake-f226a1678fe27817649ec536ad2923a98a7646a3.tar.bz2 | |
Merge branch 'master' into nsis-branding-trim-position
Diffstat (limited to 'Modules/CMakeDetermineCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index 2780399..6430793 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/Modules/CMakeDetermineCompiler.cmake @@ -68,6 +68,16 @@ macro(_cmake_find_compiler lang) ) endif() find_program(CMAKE_${lang}_COMPILER NAMES ${CMAKE_${lang}_COMPILER_LIST} DOC "${lang} compiler") + if(_CMAKE_${lang}_COMPILER_PATHS) + # As a last fall-back, search in language-specific paths + find_program(CMAKE_${lang}_COMPILER + NAMES ${CMAKE_${lang}_COMPILER_LIST} + NAMES_PER_DIR + PATHS ${_CMAKE_${lang}_COMPILER_PATHS} + DOC "${lang} compiler" + NO_DEFAULT_PATH + ) + endif() if(CMAKE_${lang}_COMPILER_INIT AND NOT CMAKE_${lang}_COMPILER) set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${CMAKE_${lang}_COMPILER_INIT}") endif() |