From ac1a1bf18bd3d395fd17eddbc5a38e710e737664 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 7 Oct 2019 17:35:53 -0400 Subject: VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated. Fixes: #19737 --- Source/cmLocalVisualStudio7Generator.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 8154f3e..82a1170 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -102,6 +102,10 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets() force += "/"; force += l->GetName(); force += "_force"; + if (cmSourceFile* sf = this->Makefile->GetOrCreateSource( + force, true, cmSourceFileLocationKind::Known)) { + sf->SetProperty("SYMBOLIC", "1"); + } if (cmSourceFile* file = this->Makefile->AddCustomCommandToOutput( force.c_str(), no_depends, no_main_dependency, force_commands, " ", 0, true)) { -- cgit v0.12 From 2a5e5b25ba4d6eb68dbee29381774562c98e228f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Oct 2019 09:44:41 -0400 Subject: CMake 3.15.5 --- Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6a64153..3bb8cc3 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 4) +set(CMake_VERSION_PATCH 5) #set(CMake_VERSION_RC 0) -- cgit v0.12 From 4b46523d905451ebdcf0ef8476ebe875945b3a62 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 25 Nov 2019 13:54:21 -0500 Subject: 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 --- Modules/CMakeParseImplicitIncludeInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12