Merge topic 'doc-ENVIRONMENT_MODIFICATION' into release-3.22
f6177f05da Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6661
diff --git a/Help/generator/Visual Studio 17 2022.rst b/Help/generator/Visual Studio 17 2022.rst
index eeff05e..b3f49f3 100644
--- a/Help/generator/Visual Studio 17 2022.rst
+++ b/Help/generator/Visual Studio 17 2022.rst
@@ -5,11 +5,6 @@
Generates Visual Studio 17 (VS 2022) project files.
-.. warning::
-
- This is experimental and based on "Visual Studio 2022 Release Candidate".
- As of this version of CMake, VS 2022 has not been released.
-
Project Types
^^^^^^^^^^^^^
@@ -51,8 +46,8 @@
Toolset Selection
^^^^^^^^^^^^^^^^^
-The ``v143`` toolset that comes with VS 17 2022 Release Candidate is selected by
-default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
+The ``v143`` toolset that comes with VS 17 2022 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.
.. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace::
diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst
index 4b0d68c..e1c6172 100644
--- a/Help/release/3.21.rst
+++ b/Help/release/3.21.rst
@@ -26,9 +26,7 @@
Generators
----------
-* The :generator:`Visual Studio 17 2022` generator was added. This is
- experimental and based on "Visual Studio 2022 Release Candidate" because
- this version of VS has not been released.
+* The :generator:`Visual Studio 17 2022` generator was added.
* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
learned to add linker launcher tools along with the linker for ``C``,
@@ -329,3 +327,10 @@
* ``hipcc`` may once again be used as a ``CXX`` compiler, and is treated as
whatever compiler it selects underneath, as CMake 3.20 and below did.
+
+3.21.4
+------
+
+* The :generator:`Visual Studio 17 2022` generator is now based on the
+ "Visual Studio 2022" release candidates. Previously it was based on
+ preview versions.
diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst
index b65c0ea..fcb655d 100644
--- a/Help/release/3.22.rst
+++ b/Help/release/3.22.rst
@@ -142,7 +142,3 @@
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 Release Candidate" because
- this version of VS has not been released.
diff --git a/Modules/CMakeTestHIPCompiler.cmake b/Modules/CMakeTestHIPCompiler.cmake
index 5acd806..ecbfa7f 100644
--- a/Modules/CMakeTestHIPCompiler.cmake
+++ b/Modules/CMakeTestHIPCompiler.cmake
@@ -10,7 +10,7 @@
endif()
set(__CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS}")
-string(APPEND CMAKE_HIP_FLAGS "--cuda-host-only")
+string(APPEND CMAKE_HIP_FLAGS " --cuda-host-only")
include(CMakeTestCompilerCommon)
