Merge topic 'vs2022' into release-3.22

6fde60a4c8 Help: Add 3.22 release note about the update for VS 2022 Preview 5
6dfe28f33c Merge branch 'backport-3.21-vs2022' into vs2022
a8414190da VS: Update Visual Studio 17 2022 generator for Preview 5
787ab7ff20 IRSL: Fix discovery of VS 2022 v143 toolset redistributables for preview 5

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6628

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 4".
+  This is experimental and based on "Visual Studio 2022 Preview 5".
   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 4 is selected by
+The ``v143`` toolset that comes with VS 17 2022 Preview 5 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.
 

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 4" because this
+  experimental and based on "Visual Studio 2022 Preview 5" because this
   version of VS has not been released.
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator

Help/release/3.22.rst

@@ -142,3 +142,7 @@ Other Changes
   This became available as of VS 16.10 (toolchain version 14.29.30037).
 
 * 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.

Modules/InstallRequiredSystemLibraries.cmake

@@ -244,7 +244,7 @@ if(MSVC)
   elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 144)
     message(WARNING "MSVC toolset v${MSVC_TOOLSET_VERSION} not yet supported.")
   elseif(MSVC_TOOLSET_VERSION EQUAL 143)
-    set(MSVC_REDIST_NAME VC142)
+    set(MSVC_REDIST_NAME VC143)
     set(_MSVC_DLL_VERSION 140)
     set(_MSVC_IDE_VERSION 17)
   elseif(MSVC_TOOLSET_VERSION EQUAL 142)