From db66c384fc3de5fb5d9fd8d9ccdb43f663499fc3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 25 Jul 2022 14:04:21 -0400 Subject: FindVulkan: Format component documentation as definition list --- Modules/FindVulkan.cmake | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index 8b322ed..96ecb80 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -15,10 +15,26 @@ 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. IMPORTED Targets ^^^^^^^^^^^^^^^^ -- cgit v0.12 From 0b538e400218d9852dbbaf1e2bcec6a3c52b4a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sat, 23 Jul 2022 22:38:23 +0200 Subject: FindVulkan: Add missing 3.24 release notes --- Help/release/3.24.rst | 4 ++++ Modules/FindVulkan.cmake | 3 +++ 2 files changed, 7 insertions(+) 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 96ecb80..2c70227 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -36,6 +36,9 @@ There are corresponding imported targets for each of these. ``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 ^^^^^^^^^^^^^^^^ -- cgit v0.12