diff options
author | Brad King <brad.king@kitware.com> | 2021-10-27 13:01:42 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-27 13:01:51 (GMT) |
commit | 1a597773ef11f8cb9cf642b8e9d3cb5b2b13279f (patch) | |
tree | 10b6cc07f1069cdd6191336836e8dcd3d641f70f /Help/release | |
parent | af3d2669a8f9276e4aa39530bbd46efbb6892f43 (diff) | |
parent | 8b64fc7dbb4cfd348425453b42fd54f15754ee83 (diff) | |
download | CMake-1a597773ef11f8cb9cf642b8e9d3cb5b2b13279f.zip CMake-1a597773ef11f8cb9cf642b8e9d3cb5b2b13279f.tar.gz CMake-1a597773ef11f8cb9cf642b8e9d3cb5b2b13279f.tar.bz2 |
Merge topic 'vs2022'
8b64fc7dbb Help: Drop 3.22 release note for VS 2022
050ed59412 Merge branch 'backport-3.21-vs2022' into vs2022
f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6664
Diffstat (limited to 'Help/release')
-rw-r--r-- | Help/release/3.21.rst | 11 | ||||
-rw-r--r-- | Help/release/3.22.rst | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index 4b0d68c..e1c6172 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. diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst index b65c0ea..fcb655d 100644 --- a/Help/release/3.22.rst +++ b/Help/release/3.22.rst @@ -142,7 +142,3 @@ Other Changes This became available as of VS 16.10 (toolchain version 14.29.30037). * The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later. - -* The :generator:`Visual Studio 17 2022` generator was updated. This is - experimental and based on "Visual Studio 2022 Release Candidate" because - this version of VS has not been released. |