diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-19 15:12:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-19 15:12:18 (GMT) |
| commit | b891af92908fbbe66dadb9ceebc660156a3c1614 (patch) | |
| tree | 3f116844d96efaf21bedf4578611fc3e3b9929b9 /Modules | |
| parent | 2f0ff16418e8015da28148fcded92c619b4b54bd (diff) | |
| parent | 65ee85d0c5b0ef4c84c3cf390c0af17ef29e1504 (diff) | |
| download | CMake-b891af92908fbbe66dadb9ceebc660156a3c1614.zip CMake-b891af92908fbbe66dadb9ceebc660156a3c1614.tar.gz CMake-b891af92908fbbe66dadb9ceebc660156a3c1614.tar.bz2 | |
Merge topic 'xcode-5.1'
65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
Diffstat (limited to 'Modules')
| -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 518b8c6..2bcf3d1 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -232,7 +232,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) |