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 /Help | |
| 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 'Help')
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 13 | ||||
| -rw-r--r-- | Help/variable/MSVC_VERSION.rst | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst index 06deda4..6007365 100644 --- a/Help/generator/Visual Studio 17 2022.rst +++ b/Help/generator/Visual Studio 17 2022.rst @@ -7,7 +7,7 @@ Generates Visual Studio 17 (VS 2022) project files. .. warning:: - This is experimental and based on "Visual Studio 2022 Preview 1.1". + This is experimental and based on "Visual Studio 2022 Preview 2". As of this version of CMake, VS 2022 has not been released. Project Types @@ -51,7 +51,7 @@ name (architecture). For example: Toolset Selection ^^^^^^^^^^^^^^^^^ -The ``v142`` toolset that comes with VS 17 2022 Preview 1.1 is selected by +The ``v143`` toolset that comes with VS 17 2022 Preview 2 is selected by default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps via the :manual:`cmake(1)` ``-T`` option, to specify another toolset. diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index 204880b..3e70552 100644 --- a/Help/release/3.21.rst +++ b/Help/release/3.21.rst @@ -27,7 +27,7 @@ Generators ---------- * The :generator:`Visual Studio 17 2022` generator was added. This is - experimental and based on "Visual Studio 2022 Preview 1.1" because this + experimental and based on "Visual Studio 2022 Preview 2" because this version of VS has not been released. * The :ref:`Makefile Generators` and the :generator:`Ninja` generator @@ -293,3 +293,14 @@ Other Changes `cmake.org <https://cmake.org/download/>`_ now support ``liblzma`` multi-threading. See the :variable:`CPACK_THREADS` and :variable:`CPACK_ARCHIVE_THREADS` variables. + +Updates +======= + +Changes made since CMake 3.21.0 include the following. + +3.21.1 +------ + +* The :generator:`Visual Studio 17 2022` generator is now based on + "Visual Studio 2022 Preview 2". Previously it was based on "Preview 1.1". diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst index 241eb03..cbb3a3c 100644 --- a/Help/variable/MSVC_VERSION.rst +++ b/Help/variable/MSVC_VERSION.rst @@ -19,8 +19,6 @@ Known version numbers are:: 1900 = VS 14.0 (v140 toolset) 1910-1919 = VS 15.0 (v141 toolset) 1920-1929 = VS 16.0 (v142 toolset) - -.. 1930-1939 = VS 17.0 (v143 toolset) See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` and |