diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-29 15:36:33 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-29 10:36:40 -0500 |
| commit | f972b929d6a8e39159b3d585cbc3bba891e12e87 (patch) | |
| tree | bcc5f7fedafc5487fe9c1155fb78e4217f2c856b | |
| parent | 89ed119c0f6cb9f838bc175dc4b3018d30f748a3 (diff) | |
| parent | 58b06746879aff8edfd832d89f8a832fb3ecbfb8 (diff) | |
| download | cmake-f972b929d6a8e39159b3d585cbc3bba891e12e87.tar.gz | |
Merge topic 'vs-16.4-custom-command-inputs' into release-3.16
58b0674687 VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4297
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 53fc93cf66..df9e7dbb66 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1430,6 +1430,7 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule( std::string comment = lg->ConstructComment(ccg); comment = cmVS10EscapeComment(comment); std::string script = lg->ConstructScript(ccg); + bool symbolic = false; // input files for custom command std::stringstream additional_inputs; { @@ -1456,6 +1457,12 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule( ConvertToWindowsSlash(dep); additional_inputs << sep << dep; sep = ";"; + if (!symbolic) { + if (cmSourceFile* sf = this->Makefile->GetSource( + dep, cmSourceFileLocationKind::Known)) { + symbolic = sf->GetPropertyAsBool("SYMBOLIC"); + } + } } } if (this->ProjectType != csproj) { @@ -1464,7 +1471,6 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule( } // output files for custom command std::stringstream outputs; - bool symbolic = false; { const char* sep = ""; for (std::string const& o : ccg.GetOutputs()) { |