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

Merge topic 'vs-compiler-id-tolerate-diagnostics' 

8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
This commit is contained in:
Brad King 2013-10-07 15:42:51 -04:00 committed by CMake Topic Stage
parent e0c7ccb1b3 8c891f86cc
commit ea574d98ed
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeDetermineCompilerId.cmake
View File

@ -161,7 +161,8 @@ Id flags: ${testflags}
) )
# Match the compiler location line printed out. # Match the compiler location line printed out.
if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "CMAKE_${lang}_COMPILER=([^%\r\n]+)[\r\n]") if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "CMAKE_${lang}_COMPILER=([^%\r\n]+)[\r\n]")
set(_comp "${CMAKE_MATCH_1}") # Strip VS diagnostic output from the end of the line.
string(REGEX REPLACE " \\(TaskId:[0-9]*\\)$" "" _comp "${CMAKE_MATCH_1}")
if(EXISTS "${_comp}") if(EXISTS "${_comp}")
file(TO_CMAKE_PATH "${_comp}" _comp) file(TO_CMAKE_PATH "${_comp}" _comp)
set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE) set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)