diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-15 12:49:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-15 12:50:13 (GMT) |
| commit | 3d661c6c3a23bed6fc34d93f6f43228691d14320 (patch) | |
| tree | 12cb48dba1c52fb5c2162a9231cb4dddd9cae648 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 05616645692cabd9af4c7483376256172f6fcad3 (diff) | |
| parent | 30c835428fffbf91191ebb1150d7fec00803523c (diff) | |
| download | CMake-3d661c6c3a23bed6fc34d93f6f43228691d14320.zip CMake-3d661c6c3a23bed6fc34d93f6f43228691d14320.tar.gz CMake-3d661c6c3a23bed6fc34d93f6f43228691d14320.tar.bz2 | |
Merge topic 'vs-toolset-version'
30c835428f VS: Accept and translate '-T version=' values with three components
58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5903
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6a90675..965ac3e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -623,14 +623,14 @@ void cmVisualStudio10TargetGenerator::Generate() } switch (this->ProjectType) { - case vcxproj: - if (this->GlobalGenerator->GetPlatformToolsetVersion()) { - Elem(e0, "Import") - .Attribute("Project", - this->GlobalGenerator->GetAuxiliaryToolset()); + case vcxproj: { + std::string const& props = + this->GlobalGenerator->GetPlatformToolsetVersionProps(); + if (!props.empty()) { + Elem(e0, "Import").Attribute("Project", props); } Elem(e0, "Import").Attribute("Project", VS10_CXX_DEFAULT_PROPS); - break; + } break; case csproj: Elem(e0, "Import") .Attribute("Project", VS10_CSharp_DEFAULT_PROPS) |