diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-26 13:19:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-26 13:19:17 (GMT) |
| commit | 3e244f67283b482c33120e1ab72c532664da90c6 (patch) | |
| tree | 3294c5331286a52ff4c98ef2c4e3692ee046ab04 | |
| parent | 2d87db1a2fd7fa530c262fe7011106e4451a872a (diff) | |
| parent | b141445f8f4a1d3d789c2712b4a371361439c30f (diff) | |
| download | CMake-3e244f67283b482c33120e1ab72c532664da90c6.zip CMake-3e244f67283b482c33120e1ab72c532664da90c6.tar.gz CMake-3e244f67283b482c33120e1ab72c532664da90c6.tar.bz2 | |
Merge topic 'FindVulkan-relnotes'
b141445f8f FindVulkan: Move dxc component docs into definition list
96573aec1c Merge branch 'backport-3.24-FindVulkan-relnotes'
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 | 32 |
2 files changed, 30 insertions, 6 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..2f69234 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -15,14 +15,34 @@ 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. -.. versionadded:: 3.25 +``glslc`` + The SPIR-V compiler. -Added optional COMPONENT ``dxc`` with corresponding targets. +``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. + +``dxc`` + .. versionadded:: 3.25 + + The DirectX Shader Compiler. + +The ``glslc`` and ``glslangValidator`` components are provided even +if not explicitly requested (for backward compatibility). IMPORTED Targets ^^^^^^^^^^^^^^^^ |