diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-24 13:57:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-24 13:58:08 (GMT) |
| commit | 5a4847a0a4c39d2617ab00687b77b2ae6238404c (patch) | |
| tree | 034699df1aeb188f4fcda7ace08474159babaf4d /Source | |
| parent | b2e2f5c1961bb389b61fafbb9a07689cc189d048 (diff) | |
| parent | 25c5ebba7edc6b871a29617ab2d7a459d81dfd58 (diff) | |
| download | CMake-5a4847a0a4c39d2617ab00687b77b2ae6238404c.zip CMake-5a4847a0a4c39d2617ab00687b77b2ae6238404c.tar.gz CMake-5a4847a0a4c39d2617ab00687b77b2ae6238404c.tar.bz2 | |
Merge topic 'vs-toolset-version' into release-3.21
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 79c06d6..d0ad53e 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. |