Skip to content
This repository was archived by the owner on Aug 13, 2024. It is now read-only.

Update vma to fix compilation error #250

Open
zcorniere wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Update vma to fix compilation error #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions libgraphics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,23 @@ endif()
fetchcontent_declare(
vma
GIT_REPOSITORY https://github.com/YaaZ/VulkanMemoryAllocator-Hpp.git
GIT_TAG da6ea76eecf12a1decc76f58a3e096bcc555bd94
GIT_TAG 62b1d32e96acf36f6da619d3f818d2edc7cbbc7b
)
fetchcontent_getproperties(vma)
if(NOT vma_POPULATED)
message(STATUS "Populating vma")
fetchcontent_populate(vma)
add_library(VulkanMemoryAllocator STATIC ${vma_SOURCE_DIR}/include/vk_mem_alloc.h)
set_source_files_properties(${vma_SOURCE_DIR}/include/vk_mem_alloc.h PROPERTIES LANGUAGE CXX)
target_include_directories(VulkanMemoryAllocator SYSTEM PUBLIC ${vma_SOURCE_DIR}/include/)
target_compile_definitions(VulkanMemoryAllocator PRIVATE VMA_IMPLEMENTATION)

if(NOT EXISTS ${vma_BINARY_DIR}/vk_mem_alloc.cpp)
file(WRITE ${vma_BINARY_DIR}/vk_mem_alloc.cpp
"#define VMA_IMPLEMENTATION\n#include \"vk_mem_alloc.h\""
)
endif()

add_library(VulkanMemoryAllocator STATIC ${vma_BINARY_DIR}/vk_mem_alloc.cpp)
target_include_directories(
VulkanMemoryAllocator SYSTEM PUBLIC ${vma_SOURCE_DIR}/VulkanMemoryAllocator/include/ ${vma_SOURCE_DIR}/include/
)
set_target_properties(VulkanMemoryAllocator PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(VulkanMemoryAllocator PUBLIC Vulkan::Vulkan)
endif()
Expand Down