mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3.21-vs2022' into vs2022

Browse Source
This commit is contained in:
Brad King
2021-10-27 08:51:00 -04:00
parent fb6ab54076 f3ddc52676
commit 050ed59412
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Help/generator/Visual Studio 17 2022.rst
View File

@@ -5,11 +5,6 @@ Visual Studio 17 2022
Generates Visual Studio 17 (VS 2022) project files. 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 Project Types
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
@@ -51,8 +46,8 @@ name (architecture). For example:
Toolset Selection Toolset Selection
^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
The ``v143`` toolset that comes with VS 17 2022 Release Candidate is selected by The ``v143`` toolset that comes with VS 17 2022 is selected by default.
default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
via the :manual:`cmake(1)` ``-T`` option, to specify another toolset. via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.
.. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace:: .. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace::

11
Help/release/3.21.rst
View File

@@ -26,9 +26,7 @@ Presets
Generators Generators
---------- ----------
* The :generator:`Visual Studio 17 2022` generator was added. This is * The :generator:`Visual Studio 17 2022` generator was added.
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 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
learned to add linker launcher tools along with the linker for ``C``, 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 * ``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. 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.