Update vkmemalloc to latest (c++20)

LLeny · Sep 12, 2023 · a8d9621 · a8d9621
1 parent c82ee71
commit a8d9621
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,6 +41,7 @@ file(GLOB_RECURSE vkhandybug_SOURCES CONFIGURE_DEPENDS
     ${imgui_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp
     ${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
     ${imgui_filedialog_SOURCE_DIR}/ImGuiFileDialog.cpp
+    ${vkmemalloc_SOURCE_DIR}/src/VmaUsage.cpp
     ${hashlib_SOURCE_DIR}/md5.cpp
     ${luasrcFiles}
 )

diff --git a/tools/dependencies.cmake b/tools/dependencies.cmake
@@ -27,7 +27,7 @@ FetchContent_Declare(
 FetchContent_Declare(
   vkmemalloc
   GIT_REPOSITORY       https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-  GIT_TAG              v3.0.1
+  GIT_TAG              2f382df218d7e8516dee3b3caccb819a62b571a2
   GIT_SHALLOW          TRUE
   GIT_PROGRESS         TRUE
 )
@@ -145,10 +145,6 @@ if(NOT libzip_POPULATED)
 endif()
 
 if(NOT APPLE)
-  file(READ "${FETCHCONTENT_BASE_DIR}/vkmemalloc-src/src/CMakeLists.txt" FILE_CONTENTS)
-  string(REPLACE "CXX_STANDARD 14" "CXX_STANDARD 20" FILE_CONTENTS "${FILE_CONTENTS}")
-  file(WRITE "${FETCHCONTENT_BASE_DIR}/vkmemalloc-src/src/CMakeLists.txt" "${FILE_CONTENTS}")
-
   #miniaudio MSVC
   file(READ "${FETCHCONTENT_BASE_DIR}/miniaudio-src/miniaudio.h" FILE_CONTENTS)
   string(REPLACE "sizeof(pInfo->name), 0, FALSE)" "sizeof(pInfo->name), 0, 0)" FILE_CONTENTS "${FILE_CONTENTS}")