diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-27 09:00:58 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-27 09:00:58 -0400 |
| commit | 9d44ea4cde39bd228969ff718911a77b13661051 (patch) | |
| tree | ed38420c338ef5d493572ffebfab95dfd43c6265 | |
| parent | 69355ff00c5a773f26c65caafbc9e77e76c824ff (diff) | |
| parent | f3ddc526765b39c75bd3d2086ec8016b47c2f36c (diff) | |
| download | cmake-9d44ea4cde39bd228969ff718911a77b13661051.tar.gz | |
Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6664
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 9 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 11 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst index eeff05eed7..b3f49f3dfa 100644 --- a/Help/generator/Visual Studio 17 2022.rst +++ b/Help/generator/Visual Studio 17 2022.rst @@ -5,11 +5,6 @@ Visual Studio 17 2022 Generates Visual Studio 17 (VS 2022) project files. -.. warning:: - - This is experimental and based on "Visual Studio 2022 Release Candidate". - As of this version of CMake, VS 2022 has not been released. - Project Types ^^^^^^^^^^^^^ @@ -51,8 +46,8 @@ name (architecture). For example: Toolset Selection ^^^^^^^^^^^^^^^^^ -The ``v143`` toolset that comes with VS 17 2022 Release Candidate is selected by -default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps +The ``v143`` toolset that comes with VS 17 2022 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. .. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace:: diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index 4b0d68c0db..e1c6172b2a 100644 --- a/Help/release/3.21.rst +++ b/Help/release/3.21.rst @@ -26,9 +26,7 @@ Presets Generators ---------- -* The :generator:`Visual Studio 17 2022` generator was added. This is - experimental and based on "Visual Studio 2022 Release Candidate" because - this version of VS has not been released. +* The :generator:`Visual Studio 17 2022` generator was added. * The :ref:`Makefile Generators` and the :generator:`Ninja` generator learned to add linker launcher tools along with the linker for ``C``, @@ -329,3 +327,10 @@ Changes made since CMake 3.21.0 include the following. * ``hipcc`` may once again be used as a ``CXX`` compiler, and is treated as whatever compiler it selects underneath, as CMake 3.20 and below did. + +3.21.4 +------ + +* The :generator:`Visual Studio 17 2022` generator is now based on the + "Visual Studio 2022" release candidates. Previously it was based on + preview versions. |