diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-12 12:13:28 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-11-12 12:20:34 -0500 |
| commit | bcbae3f71e6c3e34ce986e5f1c2156ef561eeda6 (patch) | |
| tree | ad0ac3b2f46d15e3e74ea2651ce133ed024fcab7 /Modules/CMakeDetermineOBJCXXCompiler.cmake | |
| parent | a070565a66e23059090bc2d4c828ae8a90086ced (diff) | |
| download | cmake-bcbae3f71e6c3e34ce986e5f1c2156ef561eeda6.tar.gz | |
Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs
When targeting a platform that supports multiple architectures, Xcode
may choose to build all of them in our small compiler id project.
Update the regex we use to extract the path to the compiler from
the Xcode output to account for this.
Fixes: #21425
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 99ad6c31ed..f96394c46a 100644 --- a/Modules/CMakeDetermineOBJCXXCompiler.cmake +++ b/Modules/CMakeDetermineOBJCXXCompiler.cmake @@ -120,7 +120,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) |