Merge topic 'vs2022'

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

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
This commit is contained in:
Brad King 2021-08-25 13:59:34 +00:00 committed by Kitware Robot
commit bd8a6e8abe
2 changed files with 6 additions and 3 deletions

View File

@ -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.

View File

@ -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".