diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-26 14:02:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-26 14:02:40 (GMT) |
| commit | 8db38cfe3386c463ef40af8520a5df329f9fd596 (patch) | |
| tree | 88ba15a275fbd7578652998f315e6a10feb60e50 | |
| parent | 0cb043390b3a78d80e5cf4dbbb47df1ca8c0d993 (diff) | |
| parent | 6d84afc7f2fc84f6a02402d63b40d0cce791b821 (diff) | |
| download | CMake-8db38cfe3386c463ef40af8520a5df329f9fd596.zip CMake-8db38cfe3386c463ef40af8520a5df329f9fd596.tar.gz CMake-8db38cfe3386c463ef40af8520a5df329f9fd596.tar.bz2 | |
Merge topic 'implicit-includes-extra-CR' into release-3.16
6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR
4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output
2a5e5b25ba CMake 3.15.5
08173075c1 Merge branch 'doc-genex-tweak' into release-3.15
83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15
881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15
dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15
ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4088
| -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) |