diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-13 14:40:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-13 14:41:25 (GMT) |
| commit | 72f8237422b680fa9733c9b7c4cea33a643708bb (patch) | |
| tree | 895b1a06575eda11d47732358fe8c1b238c34d98 /Modules/CMakeDetermineOBJCXXCompiler.cmake | |
| parent | f73aacc746fd11757f57ed6b0b4a67865f67d674 (diff) | |
| parent | bcbae3f71e6c3e34ce986e5f1c2156ef561eeda6 (diff) | |
| download | CMake-72f8237422b680fa9733c9b7c4cea33a643708bb.zip CMake-72f8237422b680fa9733c9b7c4cea33a643708bb.tar.gz CMake-72f8237422b680fa9733c9b7c4cea33a643708bb.tar.bz2 | |
Merge topic 'xcode-compiler-id-path'
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5506
Diffstat (limited to 'Modules/CMakeDetermineOBJCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineOBJCXXCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineOBJCXXCompiler.cmake b/Modules/CMakeDetermineOBJCXXCompiler.cmake index ffd0091..7403847 100644 --- a/Modules/CMakeDetermineOBJCXXCompiler.cmake +++ b/Modules/CMakeDetermineOBJCXXCompiler.cmake @@ -117,7 +117,7 @@ if(NOT CMAKE_OBJCXX_COMPILER_ID_RUN) # ... # /path/to/cc ...CompilerIdOBJCXX/... # to extract the compiler front-end for the language. - set(CMAKE_OBJCXX_COMPILER_ID_TOOL_MATCH_REGEX "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerIdOBJCXX/(\\./)?(CompilerIdOBJCXX.(framework|xctest)/)?CompilerIdOBJCXX[ \t\n\\\"]") + set(CMAKE_OBJCXX_COMPILER_ID_TOOL_MATCH_REGEX "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerIdOBJCXX/(\\./)?(CompilerIdOBJCXX.(framework|xctest|build/[^ \t\r\n]+)/)?CompilerIdOBJCXX[ \t\n\\\"]") set(CMAKE_OBJCXX_COMPILER_ID_TOOL_MATCH_INDEX 2) include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake) |