diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-07 21:48:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-07 21:48:38 (GMT) |
| commit | a970f7d478928be4b104b2164b2566152b39ac18 (patch) | |
| tree | a4b1d25c93fb4b28e1c370e1fbbf2e44878c9b76 | |
| parent | 098bea14e3e14ad0e4da7238d5b02957bc185aa4 (diff) | |
| parent | 7f89552a8fc0a3877b9630fdb022eb5f16bc77a3 (diff) | |
| download | CMake-a970f7d478928be4b104b2164b2566152b39ac18.zip CMake-a970f7d478928be4b104b2164b2566152b39ac18.tar.gz CMake-a970f7d478928be4b104b2164b2566152b39ac18.tar.bz2 | |
Merge branch 'xcode-ios-compiler-id' into release
| -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 613f4b3..6c6a914 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) |