diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-19 16:41:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-19 16:41:20 (GMT) |
| commit | 1f6e1a2d787a3af14ec49a69e55780f966f90ad7 (patch) | |
| tree | a62b987bda6aa8fa6a06f2b756e54b80ef791c90 /Source | |
| parent | fabbb69e69698b88f30fa44b4398cc9ff38ed436 (diff) | |
| parent | 0c7f918fb1100c96e043c2f7c13732553b746ced (diff) | |
| download | CMake-1f6e1a2d787a3af14ec49a69e55780f966f90ad7.zip CMake-1f6e1a2d787a3af14ec49a69e55780f966f90ad7.tar.gz CMake-1f6e1a2d787a3af14ec49a69e55780f966f90ad7.tar.bz2 | |
Merge topic 'vs2022'
0c7f918fb1 VS: Update Visual Studio 17 2022 generator for Preview 2
1ac1436b25 VS: Fix `/sourceDependencies` flag table entries for v143
919fc7fd5f VS: Remove broken EnableASAN entry from flag table for v143
3f19847b28 VS: Remove empty ExternalWarningLevel entry from flag table for v143
ccb6083cbe VS: Remove empty LanguageStandard entries from flag table for v143
c167de7e70 VS: Remove empty ConformanceMode entry from flag table for v143
993d706a17 VS: Populate `/JMC-` flag table entry for v143
a070d87e08 VS: Populate `-Qspectre-` flag table entry for v143
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Egor Pugin <egor.pugin@gmail.com>
Merge-request: !6350
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 4fab0b9..79c06d6 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -104,8 +104,7 @@ static const char* VSVersionToToolset( case cmGlobalVisualStudioGenerator::VS16: return "v142"; case cmGlobalVisualStudioGenerator::VS17: - // FIXME: VS 2022 Preview 1 uses v142. Will it be v143 later? - return "v142"; + return "v143"; } return ""; } |