diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-17 13:58:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-17 13:58:30 (GMT) |
| commit | 3930c354f8d3669234c783505bc84dfe7ee9dcdb (patch) | |
| tree | 1812074466cd5706cf82eb44baaf5cac19aa65be /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 594f81966d5d070082619cc5c288a8b297c0bc9f (diff) | |
| parent | aca153b104af02ebd140c888928e6e95d1d7f8c1 (diff) | |
| download | CMake-3930c354f8d3669234c783505bc84dfe7ee9dcdb.zip CMake-3930c354f8d3669234c783505bc84dfe7ee9dcdb.tar.gz CMake-3930c354f8d3669234c783505bc84dfe7ee9dcdb.tar.bz2 | |
Merge topic 'vs-csproj-scripts'
aca153b104 VS: Add custom VCEnd labels only in C# projects
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6808
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index e09ac74..9523038 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1571,10 +1571,11 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule( } } } - cmLocalVisualStudioGenerator::IsManaged isManaged = (this->Managed) - ? cmLocalVisualStudioGenerator::IsManaged::Yes - : cmLocalVisualStudioGenerator::IsManaged::No; - script += lg->FinishConstructScript(isManaged); + cmLocalVisualStudioGenerator::IsCSharp isCSharp = + (this->ProjectType == VsProjectType::csproj) + ? cmLocalVisualStudioGenerator::IsCSharp::Yes + : cmLocalVisualStudioGenerator::IsCSharp::No; + script += lg->FinishConstructScript(isCSharp); if (this->ProjectType == VsProjectType::csproj) { std::string name = "CustomCommand_" + c + "_" + cmSystemTools::ComputeStringMD5(sourcePath); @@ -4308,10 +4309,11 @@ void cmVisualStudio10TargetGenerator::WriteEvent( } } if (!script.empty()) { - cmLocalVisualStudioGenerator::IsManaged isManaged = (this->Managed) - ? cmLocalVisualStudioGenerator::IsManaged::Yes - : cmLocalVisualStudioGenerator::IsManaged::No; - script += lg->FinishConstructScript(isManaged); + cmLocalVisualStudioGenerator::IsCSharp isCSharp = + (this->ProjectType == VsProjectType::csproj) + ? cmLocalVisualStudioGenerator::IsCSharp::Yes + : cmLocalVisualStudioGenerator::IsCSharp::No; + script += lg->FinishConstructScript(isCSharp); } comment = cmVS10EscapeComment(comment); if (this->ProjectType != VsProjectType::csproj) { |