mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3.21-vs2022' into vs2022

Browse Source
This commit is contained in:
Brad King
2021-10-14 13:40:20 -04:00
parent fbc742aab0 a8414190da
commit 6dfe28f33c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Help/generator/Visual Studio 17 2022.rst
View File

@@ -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.

2
Help/release/3.21.rst
View File

@@ -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

2
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -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)