kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'xcode-ios-compiler-id' 

7f89552a Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
This commit is contained in:
Brad King 2014-11-10 10:42:57 -05:00 committed by CMake Topic Stage
parent a82dde2d3f 7f89552a8f
commit f62e476990
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineCompilerId.cmake
View File

@ -307,7 +307,7 @@ Id flags: ${testflags}
# ... # ...
# /path/to/cc ...CompilerId${lang}/... # /path/to/cc ...CompilerId${lang}/...
# to extract the compiler front-end for the language. # 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}") set(_comp "${CMAKE_MATCH_2}")
if(EXISTS "${_comp}") if(EXISTS "${_comp}")
set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE) set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)