diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-28 16:24:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-28 16:24:52 (GMT) |
| commit | 4523da9a1287e5fd1a24318fcd833bbdd42d2dfa (patch) | |
| tree | 707e1f25a20cf83feae1905ef50974a69370804f | |
| parent | 1143213e380e692ef88d560b839eccfa10babd75 (diff) | |
| parent | a60141feaafcbbe3c46211095ec71c797e6fbcd4 (diff) | |
| download | CMake-4523da9a1287e5fd1a24318fcd833bbdd42d2dfa.zip CMake-4523da9a1287e5fd1a24318fcd833bbdd42d2dfa.tar.gz CMake-4523da9a1287e5fd1a24318fcd833bbdd42d2dfa.tar.bz2 | |
Merge topic 'vs-toolset-version'
a60141feaa VS: Add special case for '-T version=14.29.16.10' under VS 16.10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6169
| -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 9a9a465..c11ab1b 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/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. |