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

Added options to let VMA use most current Vulkan headers from submodules

parent 0eaef39b
No related branches found
No related tags found
No related merge requests found
......@@ -8,6 +8,9 @@ if (${vma_hpp_status})
set(VMA_HPP_PATH "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp" CACHE INTERNAL "")
endif()
set(VMA_VULKAN_H_PATH "${vkcv_lib_path}/Vulkan-Headers/include" CACHE INTERNAL "")
set(VMA_VULKAN_HPP_PATH "${vkcv_lib_path}/Vulkan-Hpp" CACHE INTERNAL "")
set(VMA_RECORDING_ENABLED OFF CACHE INTERNAL "")
set(VMA_USE_STL_CONTAINERS OFF CACHE INTERNAL "")
set(VMA_STATIC_VULKAN_FUNCTIONS ON CACHE INTERNAL "")
......
......@@ -6,6 +6,9 @@ find_package(Vulkan REQUIRED)
option(VMA_HPP_PATH "Location of C++ headers" "")
option(VMA_VULKAN_H_PATH "Location of Vulkan C headers" "")
option(VMA_VULKAN_HPP_PATH "Location of Vulkan C++ headers" "")
message(STATUS "VMA_BUILD_SAMPLE = ${VMA_BUILD_SAMPLE}")
message(STATUS "VMA_BUILD_SAMPLE_SHADERS = ${VMA_BUILD_SAMPLE_SHADERS}")
message(STATUS "VMA_BUILD_REPLAY = ${VMA_BUILD_REPLAY}")
......@@ -38,6 +41,7 @@ set_target_properties(
CXX_STANDARD_REQUIRED ON
)
target_include_directories(VulkanMemoryAllocator SYSTEM BEFORE PRIVATE ${VMA_VULKAN_H_PATH} ${VMA_VULKAN_HPP_PATH})
target_include_directories(VulkanMemoryAllocator PUBLIC ${VMA_HPP_PATH})
# Only link to Vulkan if static linking is used
......
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