diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-06 14:46:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-01-06 14:46:48 (GMT) |
| commit | 1ab31dc2ebb608b653760a06e526139e832190f8 (patch) | |
| tree | 45fdaea452fa26dd989c33d85a0a8a67a2284948 | |
| parent | 3401c72c44a099f226c2d790e3bdb6859691416d (diff) | |
| parent | 65ee85d0c5b0ef4c84c3cf390c0af17ef29e1504 (diff) | |
| download | CMake-1ab31dc2ebb608b653760a06e526139e832190f8.zip CMake-1ab31dc2ebb608b653760a06e526139e832190f8.tar.gz CMake-1ab31dc2ebb608b653760a06e526139e832190f8.tar.bz2 | |
Merge branch 'xcode-5.1' 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 8ca5334..dd0c2bd 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -209,7 +209,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}[ \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}[ \t\n\\\"]") set(_comp "${CMAKE_MATCH_2}") if(EXISTS "${_comp}") set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE) |