diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-03 13:54:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-03 13:54:33 (GMT) |
| commit | 67cbfed81981a25aa56a3d05a267c1acf6ea5781 (patch) | |
| tree | 19a020f41949e8055f0ae8ec2d94df8226ffa382 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | d565f9f0ee849e541036d26dc1bd69e6ce908d84 (diff) | |
| parent | 13a7ae2194d44f955712d65fecf0b741049da00e (diff) | |
| download | CMake-67cbfed81981a25aa56a3d05a267c1acf6ea5781.zip CMake-67cbfed81981a25aa56a3d05a267c1acf6ea5781.tar.gz CMake-67cbfed81981a25aa56a3d05a267c1acf6ea5781.tar.bz2 | |
Merge topic 'vs-csproj-scripts' into release-3.22
13a7ae2194 VS: Revert "Add missing label in C# project-build events"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index d2c49ae..a871e4c 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1488,10 +1488,7 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule( cmCustomCommandGenerator ccg(command, c, lg, true); std::string comment = lg->ConstructComment(ccg); comment = cmVS10EscapeComment(comment); - cmLocalVisualStudioGenerator::IsManaged isManaged = (this->Managed) - ? cmLocalVisualStudioGenerator::managed - : cmLocalVisualStudioGenerator::unmanaged; - std::string script = lg->ConstructScript(ccg, isManaged); + std::string script = lg->ConstructScript(ccg); bool symbolic = false; // input files for custom command std::stringstream additional_inputs; @@ -4241,10 +4238,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent( comment += lg->ConstructComment(ccg); script += pre; pre = "\n"; - cmLocalVisualStudioGenerator::IsManaged isManaged = (this->Managed) - ? cmLocalVisualStudioGenerator::managed - : cmLocalVisualStudioGenerator::unmanaged; - script += lg->ConstructScript(ccg, isManaged); + script += lg->ConstructScript(ccg); stdPipesUTF8 = stdPipesUTF8 || cc.GetStdPipesUTF8(); } |