Skip to content
Snippets Groups Projects
Unverified Commit c46d64a5 authored by TheJackiMonster's avatar TheJackiMonster
Browse files

[#59] Second try to fix MSVC magic

parent 86f4580e
No related branches found
No related tags found
1 merge request!76Resolve "Memory-Allocator"
Pipeline #26305 passed
if ((EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator") AND if ((EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator") AND
(EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp")) (EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp"))
set(VMA_PATH "${vkcv_lib_path}/VulkanMemoryAllocator" CACHE INTERNAL "")
set(VMA_HPP_PATH "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp" CACHE INTERNAL "") set(VMA_HPP_PATH "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp" CACHE INTERNAL "")
set(VMA_RECORDING_ENABLED OFF CACHE INTERNAL "") set(VMA_RECORDING_ENABLED OFF CACHE INTERNAL "")
......
...@@ -4,7 +4,6 @@ project(VulkanMemoryAllocator) ...@@ -4,7 +4,6 @@ project(VulkanMemoryAllocator)
find_package(Vulkan REQUIRED) find_package(Vulkan REQUIRED)
option(VMA_PATH "Location of official API and headers" "")
option(VMA_HPP_PATH "Location of C++ headers" "") option(VMA_HPP_PATH "Location of C++ headers" "")
message(STATUS "VMA_BUILD_SAMPLE = ${VMA_BUILD_SAMPLE}") message(STATUS "VMA_BUILD_SAMPLE = ${VMA_BUILD_SAMPLE}")
...@@ -28,9 +27,7 @@ message(STATUS "VMA_DEBUG_INITIALIZE_ALLOCATIONS = ${VMA_DEBUG_INITIALIZE_ALLOCA ...@@ -28,9 +27,7 @@ message(STATUS "VMA_DEBUG_INITIALIZE_ALLOCATIONS = ${VMA_DEBUG_INITIALIZE_ALLOCA
message(STATUS "VMA_DEBUG_GLOBAL_MUTEX = ${VMA_DEBUG_GLOBAL_MUTEX}") message(STATUS "VMA_DEBUG_GLOBAL_MUTEX = ${VMA_DEBUG_GLOBAL_MUTEX}")
message(STATUS "VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT = ${VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT}") message(STATUS "VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT = ${VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT}")
set(VMA_LIBRARY_SOURCE_FILES ${VMA_PATH}/src/VmaUsage.cpp) add_library(VulkanMemoryAllocator vma.cpp)
add_library(VulkanMemoryAllocator ${VMA_LIBRARY_SOURCE_FILES})
set_target_properties( set_target_properties(
VulkanMemoryAllocator PROPERTIES VulkanMemoryAllocator PROPERTIES
......
#define VMA_IMPLEMENTATION
#include "vk_mem_alloc.hpp"
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