diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-26 14:00:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-26 14:00:38 (GMT) |
| commit | 6d84afc7f2fc84f6a02402d63b40d0cce791b821 (patch) | |
| tree | d32f98237527938f8234baf675f06c1e76941c84 | |
| parent | d25d75687d3fe53ab19b61b5d671c83d8203f15c (diff) | |
| parent | 4b46523d905451ebdcf0ef8476ebe875945b3a62 (diff) | |
| download | CMake-6d84afc7f2fc84f6a02402d63b40d0cce791b821.zip CMake-6d84afc7f2fc84f6a02402d63b40d0cce791b821.tar.gz CMake-6d84afc7f2fc84f6a02402d63b40d0cce791b821.tar.bz2 | |
Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR
| -rw-r--r-- | Modules/CMakeParseImplicitIncludeInfo.cmake | 2 |
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) |