Commit a970f7d4 authored by Brad King's avatar Brad King
Browse files

Merge branch 'xcode-ios-compiler-id' into release

parents 098bea14 7f89552a
...@@ -307,7 +307,7 @@ Id flags: ${testflags} ...@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment