Skip to content

Commit

Permalink
Fixed the Vulkan-Headers target guard to work well with the new alias…
Browse files Browse the repository at this point in the history
…ed definition of this target.

See #45
  • Loading branch information
apanteleev committed Feb 23, 2024
1 parent fe9e756 commit a2e059a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ endif()

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

if (NVRHI_WITH_VULKAN AND NOT TARGET Vulkan-Headers)
if (NVRHI_WITH_VULKAN AND NOT TARGET Vulkan-Headers AND NOT TARGET Vulkan::Headers)
add_subdirectory(thirdparty/Vulkan-Headers)
endif()

if (NVRHI_WITH_RTXMU)
if (TARGET Vulkan-Headers)
get_target_property(RTXMU_VULKAN_INCLUDE_DIR Vulkan-Headers INTERFACE_INCLUDE_DIRECTORIES)
elseif (TARGET Vulkan::Headers)
get_target_property(RTXMU_VULKAN_INCLUDE_DIR Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
endif()

option(RTXMU_WITH_VULKAN "" ${NVRHI_WITH_VULKAN})
Expand Down Expand Up @@ -297,7 +299,11 @@ if (NVRHI_WITH_VULKAN)
target_link_libraries(${nvrhi_vulkan_target} PUBLIC rtxmu)
endif()

target_link_libraries(${nvrhi_vulkan_target} PRIVATE Vulkan-Headers)
if (TARGET Vulkan-Headers)
target_link_libraries(${nvrhi_vulkan_target} PRIVATE Vulkan-Headers)
elseif (TARGET Vulkan::Headers)
target_link_libraries(${nvrhi_vulkan_target} PRIVATE Vulkan::Headers)
endif()

endif()

Expand Down

0 comments on commit a2e059a

Please sign in to comment.