diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-19 13:45:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-19 13:45:42 (GMT) |
| commit | 72393a9e73653ca90e769252cbbf1a7443e27510 (patch) | |
| tree | 40bbf5e6bada0072cb64337b8a344b70f81b37a6 | |
| parent | 7984f98d8f67b88eb0d48c3ecb6e6a56783495d9 (diff) | |
| parent | f117c7d11eab19d6469ec03c43e24e2d1f2752ea (diff) | |
| download | CMake-72393a9e73653ca90e769252cbbf1a7443e27510.zip CMake-72393a9e73653ca90e769252cbbf1a7443e27510.tar.gz CMake-72393a9e73653ca90e769252cbbf1a7443e27510.tar.bz2 | |
Merge topic 'vs2022' into release-3.22
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 <kwrobot@kitware.com>
Merge-request: !6640
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.22.rst | 4 |
3 files changed, 6 insertions, 6 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``, diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst index 14b3929..b65c0ea 100644 --- a/Help/release/3.22.rst +++ b/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. |