mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-26 16:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in CMakeLists.txt files

Browse Source 
Added header files, added NATVIS file, added missing project dependencies.
This commit is contained in:
Adam Sawicki 2021-12-07 16:48:59 +01:00
parent d3067c3620
commit 5c8b3ba955
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/CMakeLists.txt
View File

@ -1,7 +1,14 @@
set(VMA_LIBRARY_SOURCE_FILES set(VMA_LIBRARY_SOURCE_FILES
VmaUsage.cpp VmaUsage.cpp
VmaUsage.h
"${PROJECT_SOURCE_DIR}/include/vk_mem_alloc.h"
) )
# Visual Studio only debugger symbols
if(WIN32 AND ${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
set(VMA_LIBRARY_SOURCE_FILES ${VMA_LIBRARY_SOURCE_FILES} vk_mem_alloc.natvis)
endif()
set(CMAKE_DEBUG_POSTFIX d) set(CMAKE_DEBUG_POSTFIX d)
set(CMAKE_RELWITHDEBINFO_POSTFIX rd) set(CMAKE_RELWITHDEBINFO_POSTFIX rd)
set(CMAKE_MINSIZEREL_POSTFIX s) set(CMAKE_MINSIZEREL_POSTFIX s)
@ -20,7 +27,7 @@ set_target_properties(
target_include_directories(VulkanMemoryAllocator PUBLIC "${PROJECT_SOURCE_DIR}/include") target_include_directories(VulkanMemoryAllocator PUBLIC "${PROJECT_SOURCE_DIR}/include")
# Only link to Vulkan if static linking is used # Only link to Vulkan if static linking is used
if (NOT ${VMA_DYNAMIC_VULKAN_FUNCTIONS}) if(NOT ${VMA_DYNAMIC_VULKAN_FUNCTIONS})
target_link_libraries(VulkanMemoryAllocator PUBLIC Vulkan::Vulkan) target_link_libraries(VulkanMemoryAllocator PUBLIC Vulkan::Vulkan)
endif() endif()
@ -38,19 +45,22 @@ target_compile_definitions(
) )
install(TARGETS VulkanMemoryAllocator DESTINATION "lib") install(TARGETS VulkanMemoryAllocator DESTINATION "lib")
install(FILES "../include/vk_mem_alloc.h" DESTINATION "include") install(FILES "${PROJECT_SOURCE_DIR}/include/vk_mem_alloc.h" DESTINATION "include")
if (VMA_BUILD_SAMPLE) if(VMA_BUILD_SAMPLE)
if(WIN32) if(WIN32)
set(VMA_SAMPLE_SOURCE_FILES set(VMA_SAMPLE_SOURCE_FILES
Common.cpp Common.cpp
Common.h
SparseBindingTest.cpp SparseBindingTest.cpp
SparseBindingTest.h
Tests.cpp Tests.cpp
Tests.h
VulkanSample.cpp VulkanSample.cpp
) )
add_executable(VmaSample ${VMA_SAMPLE_SOURCE_FILES}) add_executable(VmaSample ${VMA_SAMPLE_SOURCE_FILES})
add_dependencies(VmaSample VmaSampleShaders) add_dependencies(VmaSample VulkanMemoryAllocator VmaSampleShaders)
# Visual Studio specific settings # Visual Studio specific settings
if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*") if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")

6
src/VmaReplay/CMakeLists.txt
View File

@ -3,12 +3,16 @@
if (WIN32) if (WIN32)
set(VMA_REPLAY_SOURCE_FILES set(VMA_REPLAY_SOURCE_FILES
Common.cpp Common.cpp
Common.h
Constants.cpp Constants.cpp
VmaReplay.cpp Constants.h
VmaUsage.cpp VmaUsage.cpp
VmaUsage.h
VmaReplay.cpp
) )
add_executable(VmaReplay ${VMA_REPLAY_SOURCE_FILES}) add_executable(VmaReplay ${VMA_REPLAY_SOURCE_FILES})
add_dependencies(VmaReplay VulkanMemoryAllocator)
# Enable multithreaded compiling # Enable multithreaded compiling
target_compile_options(VmaReplay PRIVATE "/MP") target_compile_options(VmaReplay PRIVATE "/MP")