From 74a2ce1e91ff31640123b91ff87b0a362f6c4cee Mon Sep 17 00:00:00 2001 From: Jan Kuhlmann <33833587+M2-TE@users.noreply.github.com> Date: Tue, 18 Feb 2025 08:15:37 +0100 Subject: [PATCH] CMake: Offer multiple choices for Vulkan C headers (#2075) * offer multiple choices for Vulkan C headers * replaced redundant link --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a124359..6c777ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,10 +213,18 @@ endif() add_library( VulkanHpp INTERFACE ) add_library( Vulkan::Hpp ALIAS VulkanHpp ) target_include_directories( VulkanHpp INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}" ) -target_include_directories( VulkanHpp INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include" ) if( VULKAN_HPP_RUN_GENERATOR ) add_dependencies( VulkanHpp build_vulkan_hpp build_video_hpp ) endif() +# Get Vulkan C headers from subdirectory, existing target or FindVulkan +if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include") + target_include_directories( VulkanHpp INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include" ) +else() + if ( NOT TARGET Vulkan::Headers ) + find_package( Vulkan REQUIRED ) + endif() + target_link_libraries( VulkanHpp INTERFACE Vulkan::Headers ) +endif() # set up compile definitions if ( VULKAN_HPP_DISABLE_ENHANCED_MODE )