Skip to content
Snippets Groups Projects
Verified Commit 6a6433bb authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Added alternative way to get vulkan headers as submodule

parent 49588295
No related branches found
No related tags found
No related merge requests found
......@@ -28,3 +28,9 @@
[submodule "modules/upscaling/lib/FidelityFX-FSR"]
path = modules/upscaling/lib/FidelityFX-FSR
url = https://github.com/GPUOpen-Effects/FidelityFX-FSR.git
[submodule "lib/Vulkan-Headers"]
path = lib/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers.git
[submodule "lib/Vulkan-Hpp"]
path = lib/Vulkan-Hpp
url = https://github.com/KhronosGroup/Vulkan-Hpp
......@@ -98,6 +98,7 @@ endif()
include(${vkcv_config}/Sources.cmake)
message(STATUS "Framework:")
message(" - Includes: [ ${vkcv_includes} ]")
message(" - Libraries: [ ${vkcv_libraries} ]")
message(" - Flags: [ ${vkcv_flags} ]")
......
......@@ -2,7 +2,26 @@
find_package(Vulkan REQUIRED)
if (Vulkan_FOUND)
list(APPEND vkcv_includes ${Vulkan_INCLUDE_DIR})
if (NOT EXISTS ${Vulkan_INCLUDE_DIR}/vulkan/vulkan.h)
use_git_submodule("${vkcv_lib_path}/Vulkan-Headers" vulkan_headers_status)
if (${vulkan_headers_status})
list(APPEND vkcv_includes ${vkcv_lib}/Vulkan-Headers/include)
endif()
else()
list(APPEND vkcv_includes ${Vulkan_INCLUDE_DIR})
endif()
if (NOT EXISTS ${Vulkan_INCLUDE_DIR}/vulkan/vulkan.hpp)
use_git_submodule("${vkcv_lib_path}/Vulkan-Hpp" vulkan_hpp_status)
if (${vulkan_hpp_status})
list(APPEND vkcv_includes ${vkcv_lib}/Vulkan-Hpp)
endif()
else()
list(APPEND vkcv_includes ${Vulkan_INCLUDE_DIR})
endif()
list(APPEND vkcv_libraries ${Vulkan_LIBRARIES})
message(${vkcv_config_msg} " Vulkan - ")
......
Subproject commit 8ba8294c86d0e99fcb457bedbd573dd678ccc9b3
Subproject commit ae1b0c36df0943795cd621a37e7f7bfd00ac958a
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment