Browse Source

VS: Add special case for '-T version=14.29.16.10' under VS 16.10

Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T
version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1).  Add a special
case for the name VS 16.11 will use for VS 16.10's default toolset, so
that it can be used with VS 16.10 too.

Using '-T version=14.29.16.10' actually works under VS 16.10 without
this change, but only because there is only one 14.29 toolset so the
two-component prefix happens to match the right one.  Make it explicit.

Issue: #21922
Brad King 4 years ago
parent
commit
a60141feaa
1 changed files with 3 additions and 0 deletions
  1. 3 0
      Source/cmGlobalVisualStudioVersionedGenerator.cxx

+ 3 - 0
Source/cmGlobalVisualStudioVersionedGenerator.cxx

@@ -504,6 +504,9 @@ cmGlobalVisualStudioVersionedGenerator::FindAuxToolset(
     if (version == "14.28.16.9" && vcToolsetVersion == "14.28.29910") {
       return AuxToolset::Default;
     }
+    if (version == "14.29.16.10" && vcToolsetVersion == "14.29.30037") {
+      return AuxToolset::Default;
+    }
 
     // The first two components of the default toolset version typically
     // match the name used by later VS versions for the SxS props files.