From 787ab7ff20ca74b57cfd3c18b0e92be1844ba244 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Oct 2021 12:36:51 -0400 Subject: IRSL: Fix discovery of VS 2022 v143 toolset redistributables for preview 5 VS 2022 Preview 5 renamed the redist directories from `Microsoft.VC142.*` to `Microsoft.VC143.*` in order to match the `v143` toolset name. Fixes: #22586 --- Modules/InstallRequiredSystemLibraries.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 331623f..a267278 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -225,7 +225,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) -- cgit v0.12 From a8414190da56606ef103c04842598b0d303f8f4c Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Oct 2021 13:38:44 -0400 Subject: VS: Update Visual Studio 17 2022 generator for Preview 5 --- Help/generator/Visual Studio 17 2022.rst | 4 ++-- Help/release/3.21.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst index 708909e..1f76d2f 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 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. diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index a468817..2a676fa 100644 --- a/Help/release/3.21.rst +++ b/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 -- cgit v0.12