Pārlūkot izejas kodu

Merge topic 'vs-toolset-version' into release-3.20

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

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6169
Brad King 4 gadi atpakaļ
vecāks
revīzija
f4f80cfec6
1 mainītis faili ar 3 papildinājumiem un 0 dzēšanām
  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") {
     if (version == "14.28.16.9" && vcToolsetVersion == "14.28.29910") {
       return AuxToolset::Default;
       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
     // The first two components of the default toolset version typically
     // match the name used by later VS versions for the SxS props files.
     // match the name used by later VS versions for the SxS props files.