diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-26 13:19:09 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-26 09:19:16 -0400 |
| commit | feba099ba39354642ad9f4a5a2bd85a5ba7c8af8 (patch) | |
| tree | b19f1b76598f8edcf19ea818a22b0eaaa6699d4b | |
| parent | 22c535299019eb835dd0d5793d3b40e59d0cc6ee (diff) | |
| parent | 0b538e400218d9852dbbaf1e2bcec6a3c52b4a4d (diff) | |
| download | cmake-feba099ba39354642ad9f4a5a2bd85a5ba7c8af8.tar.gz | |
Merge topic 'FindVulkan-relnotes' into release-3.24
0b538e4002 FindVulkan: Add missing 3.24 release notes
db66c384fc FindVulkan: Format component documentation as definition list
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7502
| -rw-r--r-- | Help/release/3.24.rst | 4 | ||||
| -rw-r--r-- | Modules/FindVulkan.cmake | 27 |
2 files changed, 27 insertions, 4 deletions
diff --git a/Help/release/3.24.rst b/Help/release/3.24.rst index f9e66b64e1..02252e0c59 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 8b322edb5e..2c702274cb 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). IMPORTED Targets ^^^^^^^^^^^^^^^^ |