summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-27 16:50:55 -0400
committerBrad King <brad.king@kitware.com>2021-08-19 14:57:30 -0400
commit25c5ebba7edc6b871a29617ab2d7a459d81dfd58 (patch)
treea757dac58e87ff8ebdcd7ce617399b677a84ef5e
parent30dd9b33a048ec76fd48665f3793cf282cd75f12 (diff)
downloadcmake-25c5ebba7edc6b871a29617ab2d7a459d81dfd58.tar.gz
VS: Add special case for '-T version=14.29.16.11' under VS 16.11
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) and updated by commit a60141feaa (VS: Add special case for '-T version=14.29.16.10' under VS 16.10, 2021-05-27, v3.20.4~11^2). Add a special case for the name VS 17 will use for VS 16.11's default toolset, so that it can be used with VS 16.11 too. Issue: #21922
-rw-r--r--Source/cmGlobalVisualStudioVersionedGenerator.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 79c06d6a15..d0ad53e984 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -618,6 +618,9 @@ cmGlobalVisualStudioVersionedGenerator::FindAuxToolset(
if (version == "14.29.16.10" && vcToolsetVersion == "14.29.30037") {
return AuxToolset::Default;
}
+ if (version == "14.29.16.11" && vcToolsetVersion == "14.29.30133") {
+ 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.