From c5547ffad177145da5115587a7ce463a644ce06e Mon Sep 17 00:00:00 2001
From: Juan Ramos <juan@lunarg.com>
Date: Tue, 11 Jul 2023 12:56:32 -0600
Subject: [PATCH 1/3] cmake: Use share instead of DATADIR for CMake config
files
See the following discussion for context:
https://discourse.cmake.org/t/what-should-the-destination-be-for-a-header-only-librarys-cmake-config-file/8473/2
NOTE: I've never seen this cause an issue before, but better safe than sorry.
Also I think it reads a bit better.
I recently did this for VulkanHeaders so I'd like this fixed here as
well.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc31a3..79592f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ if (PROJECT_IS_TOP_LEVEL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(TARGETS VulkanMemoryAllocator EXPORT VulkanMemoryAllocatorConfig INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(EXPORT VulkanMemoryAllocatorConfig NAMESPACE "GPUOpen::" DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/VulkanMemoryAllocator")
+ install(EXPORT VulkanMemoryAllocatorConfig NAMESPACE "GPUOpen::" DESTINATION "share/cmake/VulkanMemoryAllocator")
option(VMA_BUILD_DOCUMENTATION "Create and install the HTML based API documentation")
if(VMA_BUILD_DOCUMENTATION)
From b48d20cc862a447cddfc7686249d019af70b109e Mon Sep 17 00:00:00 2001
From: Juan Ramos <juan@lunarg.com>
Date: Tue, 11 Jul 2023 13:18:08 -0600
Subject: [PATCH 2/3] Fixup include of "vk_mem_alloc.h"
No need to include via `../include`
By linking against `GPUOpen::VulkanMemoryAllocator` the proper
include directory is added to the project.
---
src/CMakeLists.txt | 2 ++
src/VmaUsage.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b72bbcd..b51f1fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,6 +44,8 @@ else()
target_link_libraries(VmaSample PUBLIC Vulkan::Headers)
endif()
+target_link_libraries(VmaSample PRIVATE GPUOpen::VulkanMemoryAllocator)
+
target_compile_definitions(VmaSample PUBLIC
VMA_STATIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_STATIC_VULKAN_FUNCTIONS}>
VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_DYNAMIC_VULKAN_FUNCTIONS}>
diff --git a/src/VmaUsage.h b/src/VmaUsage.h
index 62bcd11..61f87d3 100644
--- a/src/VmaUsage.h
+++ b/src/VmaUsage.h
@@ -95,7 +95,7 @@ include all public interface declarations. Example:
#pragma clang diagnostic ignored "-Wnullability-completeness"
#endif
-#include "../include/vk_mem_alloc.h"
+#include "vk_mem_alloc.h"
#ifdef __clang__
#pragma clang diagnostic pop
From 09524f7072099a66cd0485086fadabfdc57ca092 Mon Sep 17 00:00:00 2001
From: Juan Ramos <juan@lunarg.com>
Date: Thu, 13 Jul 2023 15:27:27 -0600
Subject: [PATCH 3/3] git: ignore .vscode directory
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index d450194..875c4e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/build/*
!/bin/VmaSample_Release_vs2019.exe
!/bin/Shader*.spv
+.vscode/