Bläddra i källkod

Merge topic 'vs2022' into release-3.21

c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6480
Brad King 4 år sedan
förälder
incheckning
af71bdb601
2 ändrade filer med 6 tillägg och 3 borttagningar
  1. 2 2
      Help/generator/Visual Studio 17 2022.rst
  2. 4 1
      Help/release/3.21.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 2".
+  This is experimental and based on "Visual Studio 2022 Preview 3.1".
   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 2 is selected by
+The ``v143`` toolset that comes with VS 17 2022 Preview 3.1 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.
 

+ 4 - 1
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 2" because this
+  experimental and based on "Visual Studio 2022 Preview 3.1" because this
   version of VS has not been released.
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
@@ -310,3 +310,6 @@ Changes made since CMake 3.21.0 include the following.
 
 * ``CUDA`` targets with :prop_tgt:`CUDA_SEPARABLE_COMPILATION` enabled are now
   correctly generated in non-root directories.
+
+* The :generator:`Visual Studio 17 2022` generator is now based on
+  "Visual Studio 2022 Preview 3.1".  Previously it was based on "Preview 2".