diff options
author | Brad King <brad.king@kitware.com> | 2021-12-02 22:41:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-12-02 23:06:39 (GMT) |
commit | 13a7ae2194d44f955712d65fecf0b741049da00e (patch) | |
tree | 6dc6cd3a86339ee588aab1860f9a165bd5f319a0 /Source/cmLocalVisualStudio7Generator.cxx | |
parent | eeaf1e10cb5f736692136cb31c4ffbb717599917 (diff) | |
download | CMake-13a7ae2194d44f955712d65fecf0b741049da00e.zip CMake-13a7ae2194d44f955712d65fecf0b741049da00e.tar.gz CMake-13a7ae2194d44f955712d65fecf0b741049da00e.tar.bz2 |
VS: Revert "Add missing label in C# project-build events"
Revert commit b284a21fee (VS: Add missing label in C# project-build
events, 2021-09-03, v3.22.0-rc1~156^2). The change broke cases using
multiple successful custom commands. Revert it pending further
investigation into the interaction of the generated script code with
`Microsoft.Common.CurrentVersion.targets`, and whether this is needed
for all managed projects or just C# projects.
Also add a test covering the case that was broken.
Fixes: #22964
Issue: #21440
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 5d3e11a..96dda53 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -567,7 +567,7 @@ public: } else { this->Stream << this->LG->EscapeForXML("\n"); } - std::string script = this->LG->ConstructScript(ccg, unmanaged); + std::string script = this->LG->ConstructScript(ccg); this->Stream << this->LG->EscapeForXML(script); } @@ -1780,7 +1780,7 @@ void cmLocalVisualStudio7Generator::WriteCustomRule( } std::string comment = this->ConstructComment(ccg); - std::string script = this->ConstructScript(ccg, unmanaged); + std::string script = this->ConstructScript(ccg); if (this->FortranProject) { cmSystemTools::ReplaceString(script, "$(Configuration)", config); } |