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/ 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) 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=$ 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