From ed5993af8384ae373b73cc6a400b5ac3e8aa89f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 18 Feb 2025 13:32:34 +0100 Subject: [PATCH] Revert MR #2075 (#2080) --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c777ad..a124359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,18 +213,10 @@ 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 )