diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-23 12:48:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-23 12:48:52 (GMT) |
| commit | 14a0794b66d64e856d8b41afec086f1fb94f503d (patch) | |
| tree | 3638c9aaa304200a0edda23ad0db9476c8139af7 /Source | |
| parent | fa9a7ba82ce189f28d4b68d58136cf254668948f (diff) | |
| parent | 2d54d6f3957a0cf4962ee73a9e0af6d0e13253c8 (diff) | |
| download | CMake-14a0794b66d64e856d8b41afec086f1fb94f503d.zip CMake-14a0794b66d64e856d8b41afec086f1fb94f503d.tar.gz CMake-14a0794b66d64e856d8b41afec086f1fb94f503d.tar.bz2 | |
Merge topic 'vs-dotnet-sdk-package'
2d54d6f395 VS: Fix PACKAGE target build with SDK-style projects
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7704
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 4c1fa01..9b40542 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -495,7 +495,7 @@ void cmVisualStudio10TargetGenerator::WriteClassicMsBuildProjectFile( e1.Element("PreferredToolArchitecture", hostArch); } - // ALL_BUILD and ZERO_CHECK projects transitively include + // The ALL_BUILD, PACKAGE, and ZERO_CHECK projects transitively include // Microsoft.Common.CurrentVersion.targets which triggers Target // ResolveNugetPackageAssets when SDK-style targets are in the project. // However, these projects have no nuget packages to reference and the @@ -503,7 +503,7 @@ void cmVisualStudio10TargetGenerator::WriteClassicMsBuildProjectFile( // Setting ResolveNugetPackages to false skips this target and the build // succeeds. cm::string_view targetName{ this->GeneratorTarget->GetName() }; - if (targetName == "ALL_BUILD" || + if (targetName == "ALL_BUILD" || targetName == "PACKAGE" || targetName == CMAKE_CHECK_BUILD_SYSTEM_TARGET) { Elem e1(e0, "PropertyGroup"); e1.Element("ResolveNugetPackages", "false"); |