diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-14 17:49:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-14 17:50:11 (GMT) |
| commit | 4d4336e3ed6bdc97d15a115af1905538daee5097 (patch) | |
| tree | a63d997af770c6f51f06d289858c06b61b25b2bb | |
| parent | 69f3fa9816ec17b2a1b75464530bc267d76588fe (diff) | |
| parent | a8414190da56606ef103c04842598b0d303f8f4c (diff) | |
| download | CMake-4d4336e3ed6bdc97d15a115af1905538daee5097.zip CMake-4d4336e3ed6bdc97d15a115af1905538daee5097.tar.gz CMake-4d4336e3ed6bdc97d15a115af1905538daee5097.tar.bz2 | |
Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6628
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 2 | ||||
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 2 |
3 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 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 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) |