CMake: use Vulkan-Headers target instead of DILIGENT_VULKAN_HEADERS_D…

…IR variable (DiligentGraphics/DiligentEngine#40)
DiligentGraphics · Mar 31, 2022 · e646f6d · e646f6d
1 parent bfec34c
commit e646f6d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/Graphics/Archiver/CMakeLists.txt b/Graphics/Archiver/CMakeLists.txt
@@ -112,11 +112,10 @@ if(D3D12_SUPPORTED)
 endif()
 
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Diligent-Archiver-static PRIVATE Diligent-GraphicsEngineVk-static)
+    target_link_libraries(Diligent-Archiver-static PRIVATE Diligent-GraphicsEngineVk-static Vulkan-Headers)
     target_include_directories(Diligent-Archiver-static
     PRIVATE
         ../GraphicsEngineVulkan/include
-        ${DILIGENT_VULKAN_HEADERS_DIR}/include
     )
 endif()
 

diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -165,7 +165,6 @@ target_include_directories(Diligent-GraphicsEngineVk-static
 PRIVATE
     include
     ${DILIGENT_VOLK_DIR}
-    ${DILIGENT_VULKAN_HEADERS_DIR}/include
 )
 
 set(PRIVATE_DEPENDENCIES
@@ -174,6 +173,7 @@ set(PRIVATE_DEPENDENCIES
     Diligent-TargetPlatform
     Diligent-GraphicsEngineNextGenBase
     Diligent-ShaderTools
+    Vulkan-Headers
 )
 
 if (${DILIGENT_NO_HLSL})

diff --git a/Tests/GPUTestFramework/CMakeLists.txt b/Tests/GPUTestFramework/CMakeLists.txt
@@ -99,12 +99,9 @@ if(PLATFORM_LINUX)
 endif()
 
 if(VULKAN_SUPPORTED)
-    target_include_directories(Diligent-GPUTestFramework
-    PUBLIC
-        ${DILIGENT_VOLK_DIR}
-        ${DILIGENT_VULKAN_HEADERS_DIR}/include
-    )
-
+    target_include_directories(Diligent-GPUTestFramework PUBLIC ${DILIGENT_VOLK_DIR})
+    target_link_libraries(Diligent-GPUTestFramework PUBLIC Vulkan-Headers)
+
     if(PLATFORM_LINUX)
         target_link_libraries(Diligent-GPUTestFramework
         PUBLIC

diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
@@ -29,13 +29,15 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
     endif()
     install(FILES "${SPIRV-Headers_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Headers-License.txt)
 
-    if (NOT DILIGENT_VULKAN_HEADERS_DIR)
-        set(DILIGENT_VULKAN_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers" CACHE PATH "Vulkan-Headers source directory")
+    if (NOT TARGET Vulkan-Headers)
+        # Manually add the Vulkan-Headers target as this is all we need and the
+        # project's CMake creates unnecessary targets
+        add_library(Vulkan-Headers INTERFACE)
+        # Vulkan-Headers_SOURCE_DIR variable is normally created by project(Vulkan-Headers)
+        set(Vulkan-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
+        target_include_directories(Vulkan-Headers INTERFACE "${Vulkan-Headers_SOURCE_DIR}/include")
     endif()
-    if (NOT EXISTS "${DILIGENT_VULKAN_HEADERS_DIR}/include/vulkan/vulkan.h")
-        message(FATAL_ERROR "${DILIGENT_VULKAN_HEADERS_DIR}/include/vulkan/vulkan.h does not exist. This indicates that Vulkan-Headers submodule is not checked out or DILIGENT_VULKAN_HEADERS_DIR variable contains invalid path.")
-    endif()
-    install(FILES "${DILIGENT_VULKAN_HEADERS_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt)
+    install(FILES "${Vulkan-Headers_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt)
 
     option(DILIGENT_NO_GLSLANG "Do NOT build glslang compiler" OFF)
     option(DILIGENT_IMPROVE_SPIRV_TOOLS_DEBUG_PERF "Enable some optimizations for SPIRV-Tools, glslang, SPIRV-Cross and related projects in debug build to improve performance" ON)