CMake: use namespaces for volk and Vulkan-Headers targets

Author: TheMostDiligent

Graphics/Archiver/CMakeLists.txt

@@ -112,7 +112,7 @@ if(D3D12_SUPPORTED)
 endif()
 
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Diligent-Archiver-static PRIVATE Diligent-GraphicsEngineVk-static Vulkan-Headers)
+    target_link_libraries(Diligent-Archiver-static PRIVATE Diligent-GraphicsEngineVk-static Vulkan::Headers)
     target_include_directories(Diligent-Archiver-static
     PRIVATE
         ../GraphicsEngineVulkan/include

Graphics/GraphicsEngineVulkan/CMakeLists.txt

@@ -172,7 +172,7 @@ set(PRIVATE_DEPENDENCIES
     Diligent-TargetPlatform
     Diligent-GraphicsEngineNextGenBase
     Diligent-ShaderTools
-    Vulkan-Headers
+    Vulkan::Headers
 )
 
 if (${DILIGENT_NO_HLSL})
@@ -246,19 +246,19 @@ else()
 endif()
 
 if(PLATFORM_WIN32)
-    list(APPEND PRIVATE_DEPENDENCIES volk_headers)
+    list(APPEND PRIVATE_DEPENDENCIES volk::volk_headers)
 elseif(PLATFORM_MACOS)
-    list(APPEND PRIVATE_DEPENDENCIES volk_headers)
+    list(APPEND PRIVATE_DEPENDENCIES volk::volk_headers)
 elseif(PLATFORM_IOS OR PLATFORM_TVOS)
     find_library(CORE_GRAPHICS CoreGraphics)
     find_library(METAL_LIBRARY Metal)
     find_library(QUARTZ_CORE QuartzCore)
     find_library(UI_KIT UIKit)
     list(APPEND PRIVATE_DEPENDENCIES ${MOLTENVK_LIBRARY} ${CORE_GRAPHICS} ${METAL_LIBRARY} ${QUARTZ_CORE} ${UI_KIT})
 elseif(PLATFORM_LINUX)
-    list(APPEND PRIVATE_DEPENDENCIES volk_headers)
+    list(APPEND PRIVATE_DEPENDENCIES volk::volk_headers)
 elseif(PLATFORM_ANDROID)
-    list(APPEND PRIVATE_DEPENDENCIES volk_headers)
+    list(APPEND PRIVATE_DEPENDENCIES volk::volk_headers)
 else()
     find_library(Vulkan_LIBRARY NAMES vulkan)
     list(APPEND PRIVATE_DEPENDENCIES ${Vulkan_LIBRARY})

Tests/GPUTestFramework/CMakeLists.txt

@@ -99,8 +99,8 @@ if(PLATFORM_LINUX)
 endif()
 
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Diligent-GPUTestFramework PUBLIC Vulkan-Headers volk_headers)
-    
+    target_link_libraries(Diligent-GPUTestFramework PUBLIC Vulkan::Headers volk::volk_headers)
+
     if(PLATFORM_LINUX)
         target_link_libraries(Diligent-GPUTestFramework
         PUBLIC

ThirdParty/CMakeLists.txt

@@ -31,12 +31,13 @@ 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 TARGET Vulkan-Headers)
+    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")
+        add_library(Vulkan::Headers ALIAS Vulkan-Headers)
         target_include_directories(Vulkan-Headers INTERFACE "${Vulkan-Headers_SOURCE_DIR}/include")
     endif()
     install(FILES "${Vulkan-Headers_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt)
@@ -133,7 +134,7 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
 endif()
 
 if (VULKAN_SUPPORTED AND (PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_ANDROID))
-    if (NOT TARGET volk)
+    if (NOT TARGET volk::volk)
         set(VOLK_PULL_IN_VULKAN OFF)
         set(VOLK_INSTALL OFF)
         add_subdirectory(volk)