diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-25 13:59:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-25 13:59:47 (GMT) |
| commit | bd8a6e8abeae96b3579d8e9fbe716e88abb7e360 (patch) | |
| tree | 9b65ac71b2999064e6c5adec7879aaeb51b90750 | |
| parent | b0a24db270f70c7fcd834d2dfa282c76d08013e1 (diff) | |
| parent | c8ec137da762d52ae597c8cdb369e7f4958f126f (diff) | |
| download | CMake-bd8a6e8abeae96b3579d8e9fbe716e88abb7e360.zip CMake-bd8a6e8abeae96b3579d8e9fbe716e88abb7e360.tar.gz CMake-bd8a6e8abeae96b3579d8e9fbe716e88abb7e360.tar.bz2 | |
Merge topic 'vs2022'
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
| -rw-r--r-- | Help/generator/Visual Studio 17 2022.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.21.rst | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst index 6007365..8b97b9f 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 2". + This is experimental and based on "Visual Studio 2022 Preview 3.1". 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 2 is selected by +The ``v143`` toolset that comes with VS 17 2022 Preview 3.1 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 fc5d6ac..a5125ac 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 2" because this + experimental and based on "Visual Studio 2022 Preview 3.1" because this version of VS has not been released. * The :ref:`Makefile Generators` and the :generator:`Ninja` generator @@ -310,3 +310,6 @@ Changes made since CMake 3.21.0 include the following. * ``CUDA`` targets with :prop_tgt:`CUDA_SEPARABLE_COMPILATION` enabled are now correctly generated in non-root directories. + +* The :generator:`Visual Studio 17 2022` generator is now based on + "Visual Studio 2022 Preview 3.1". Previously it was based on "Preview 2". |