summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-25 18:54:21 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-25 19:32:02 (GMT)
commit4b46523d905451ebdcf0ef8476ebe875945b3a62 (patch)
treea90f20ffa72bd817eb8409f37d8ed3e8a3b66ae0 /Modules
parent2a5e5b25ba4d6eb68dbee29381774562c98e228f (diff)
downloadCMake-4b46523d905451ebdcf0ef8476ebe875945b3a62.zip
CMake-4b46523d905451ebdcf0ef8476ebe875945b3a62.tar.gz
CMake-4b46523d905451ebdcf0ef8476ebe875945b3a62.tar.bz2
CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output
With Clang/LLVM on MinGW, lines ending in `\r\r\n` have been observed. Filter out all `\r` characters from these line endings. Fixes: #20021
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeParseImplicitIncludeInfo.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeParseImplicitIncludeInfo.cmake b/Modules/CMakeParseImplicitIncludeInfo.cmake
index 91d03cd..ff4c325 100644
--- a/Modules/CMakeParseImplicitIncludeInfo.cmake
+++ b/Modules/CMakeParseImplicitIncludeInfo.cmake
@@ -167,7 +167,7 @@ function(cmake_parse_implicit_include_info text lang dir_var log_var state_var)
set(log "")
# go through each line of output...
- string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
+ string(REGEX REPLACE "\r*\n" ";" output_lines "${text}")
foreach(line IN LISTS output_lines)
if(state STREQUAL start)
string(FIND "${line}" "#include \"...\" search starts here:" rv)