Browse Source

Merge topic 'vs2022'

f117c7d11e Help: Update 3.22 release notes for the VS 2022 Release Candidate
d5a7448fa4 Merge branch 'backport-3.21-vs2022' into vs2022
3d9d75b0be VS: Update Visual Studio 17 2022 generator for the Release Candidate

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6640
Brad King 4 years ago
parent
commit
622add8671
3 changed files with 6 additions and 6 deletions
  1. 2 2
      Help/generator/Visual Studio 17 2022.rst
  2. 2 2
      Help/release/3.21.rst
  3. 2 2
      Help/release/3.22.rst

+ 2 - 2
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 5".
+  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,7 +51,7 @@ name (architecture).  For example:
 Toolset Selection
 ^^^^^^^^^^^^^^^^^
 
-The ``v143`` toolset that comes with VS 17 2022 Preview 5 is selected by
+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
 via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.
 

+ 2 - 2
Help/release/3.21.rst

@@ -27,8 +27,8 @@ Generators
 ----------
 
 * The :generator:`Visual Studio 17 2022` generator was added.  This is
-  experimental and based on "Visual Studio 2022 Preview 5" because this
-  version of VS has not been released.
+  experimental and based on "Visual Studio 2022 Release Candidate" because
+  this version of VS has not been released.
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
   learned to add linker launcher tools along with the linker for ``C``,

+ 2 - 2
Help/release/3.22.rst

@@ -144,5 +144,5 @@ Other Changes
 * 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 Preview 5" because this
-  version of VS has not been released.
+  experimental and based on "Visual Studio 2022 Release Candidate" because
+  this version of VS has not been released.