diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-19 13:34:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-19 13:35:50 (GMT) |
| commit | 69c6994023c05aefdbec15cacf2b4dae9e12622e (patch) | |
| tree | ac3661ebe40e7d1d9c9925d3b70bff1a4a442ce4 | |
| parent | 71dc6feed8c60ab86faf46e0162142bf690a2da0 (diff) | |
| parent | 3d9d75b0bea439e3e9957733964668030e849dfe (diff) | |
| download | CMake-69c6994023c05aefdbec15cacf2b4dae9e12622e.zip CMake-69c6994023c05aefdbec15cacf2b4dae9e12622e.tar.gz CMake-69c6994023c05aefdbec15cacf2b4dae9e12622e.tar.bz2 | |
Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6640
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst index 1f76d2f..eeff05e 100644 --- a/Help/generator/Visual Studio 17 2022.rst +++ b/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. diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index 2a676fa..4b0d68c 100644 --- a/Help/release/3.21.rst +++ b/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``, |