diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-10 15:42:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-10 15:42:57 (GMT) |
| commit | f62e476990df9814b6be61a231b6b4e3ff140547 (patch) | |
| tree | 1820fbeddd506c4769788206cd924ba475d62a57 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | a82dde2d3ffa850bc7c3be80d5eae8a2607ba669 (diff) | |
| parent | 7f89552a8fc0a3877b9630fdb022eb5f16bc77a3 (diff) | |
| download | CMake-f62e476990df9814b6be61a231b6b4e3ff140547.zip CMake-f62e476990df9814b6be61a231b6b4e3ff140547.tar.gz CMake-f62e476990df9814b6be61a231b6b4e3ff140547.tar.bz2 | |
Merge topic 'xcode-ios-compiler-id'
7f89552a Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 9ce99f9..0ea9ce1 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -307,7 +307,7 @@ Id flags: ${testflags} # ... # /path/to/cc ...CompilerId${lang}/... # to extract the compiler front-end for the language. - if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}(/CompilerId${lang}.xctest)?/(\\./)?CompilerId${lang}[ \t\n\\\"]") + if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/(\\./)?(CompilerId${lang}.xctest/)?CompilerId${lang}[ \t\n\\\"]") set(_comp "${CMAKE_MATCH_2}") if(EXISTS "${_comp}") set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE) |