Merge branch 'backport-3.24-FindVulkan-relnotes'

2 files changed, 27 insertions, 4 deletions

diff --git a/Help/release/3.24.rst b/Help/release/3.24.rst
index f9e66b6..02252e0 100644
--- a/Help/release/3.24.rst
+++ b/Help/release/3.24.rst
@@ -220,6 +220,10 @@ Modules
   gained a ``NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES`` option to disable
   automatic linking of MATLAB libraries.
 
+* The :module:`FindVulkan` module now supports components to select which
+  VulkanSDK tool and libraries to find in addition to the Vulkan SDK headers
+  and library.
+
 * The :module:`FindZLIB` gained a new ``ZLIB_USE_STATIC_LIBS`` variable to
   search only for static libraries.
 
diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake
index 0dcdb31..38a54ba 100644
--- a/Modules/FindVulkan.cmake
+++ b/Modules/FindVulkan.cmake
@@ -15,10 +15,29 @@ Optional COMPONENTS
 
 .. versionadded:: 3.24
 
-This module respects several optional COMPONENTS: ``glslc``,
-``glslangValidator``, ``glslang``, ``shaderc_combined`` and ``SPIRV-Tools``.
-On macOS, an additional component ``MoltenVK`` is available.
-There are corresponding import targets for each of these flags.
+This module respects several optional COMPONENTS.
+There are corresponding imported targets for each of these.
+
+``glslc``
+  The SPIR-V compiler.
+
+``glslangValidator``
+  The ``glslangValidator`` tool.
+
+``glslang``
+  The SPIR-V generator library.
+
+``shaderc_combined``
+  The static library for Vulkan shader compilation.
+
+``SPIRV-Tools``
+  Tools to process SPIR-V modules.
+
+``MoltenVK``
+  On macOS, an additional component ``MoltenVK`` is available.
+
+The ``glslc`` and ``glslangValidator`` components are provided even
+if not explicitly requested (for backward compatibility).
 
 .. versionadded:: 3.25