diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-16 15:36:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-16 15:36:56 (GMT) |
| commit | d71425f989b840dd8a07c7e52c20252ecce27086 (patch) | |
| tree | 38a42756e4b95819f752c48f49796c75904a7295 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 4663c82f9e74700ebf7f1677c518869fe5589f8c (diff) | |
| parent | dff98aa9ca68cf876a4ac5e73ccd1aa9b5a30da7 (diff) | |
| download | CMake-d71425f989b840dd8a07c7e52c20252ecce27086.zip CMake-d71425f989b840dd8a07c7e52c20252ecce27086.tar.gz CMake-d71425f989b840dd8a07c7e52c20252ecce27086.tar.bz2 | |
Merge topic 'vs-csproj-scripts'
dff98aa9ca VS: add missing label in C# project-build events
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6801
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index dc9dcc7..a9db953 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -570,7 +570,17 @@ public: this->First = true; this->Stream << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\""; } - void Finish() { this->Stream << (this->First ? "" : "\"") << "/>\n"; } + void Finish() + { + // If any commands were generated, finish constructing them. + if (!this->First) { + std::string finishScript = + this->LG->FinishConstructScript(IsManaged::No); + this->Stream << this->LG->EscapeForXML(finishScript) << "\""; + } + + this->Stream << "/>\n"; + } void Write(std::vector<cmCustomCommand> const& ccs) { for (cmCustomCommand const& command : ccs) { @@ -1808,6 +1818,7 @@ void cmLocalVisualStudio7Generator::WriteCustomRule( if (this->FortranProject) { cmSystemTools::ReplaceString(script, "$(Configuration)", config); } + script += this->FinishConstructScript(IsManaged::No); /* clang-format off */ fout << "\t\t\t\t\t<Tool\n" << "\t\t\t\t\tName=\"" << customTool << "\"\n" |