Skip to content

Commit

Permalink
WIP: Use vku with vcpkg overlays.
Browse files Browse the repository at this point in the history
  • Loading branch information
stripe2933 committed Jul 21, 2024
1 parent 67279d5 commit d6a79ef
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions overlays/vku/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stripe2933/vku
REF v0.1.0-test6
SHA512 ba33717bf7c9329163dd99174ee98adf22682518cea28c091a68147fa3ea7e8fe24a32a26bb190aa03525ff4077535f249461a1b5d78164ae1d1fd0d4f667a3a
REF v0.1.0-test7
SHA512 c17bc05f87b89e6a48e1558f8c2d0d7738d7f17221a5e78c9f4523b2b433ae26dff51136276aa421b56804f749741e03f4210e375f413139fd7ee5e33bb70d9e
HEAD_REF module
PATCHES vcpkg-deps.patch
)
Expand Down
22 changes: 11 additions & 11 deletions overlays/vku/vcpkg-deps.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/extlibs/module-ports/vk_mem_alloc.cppm b/extlibs/module-ports/vk_mem_alloc.cppm
--- a/extlibs/module-ports/vk_mem_alloc.cppm (revision 0e4f227c492f9f612e6c7e3ebb1bba70d34622c6)
+++ b/extlibs/module-ports/vk_mem_alloc.cppm (date 1721577111225)
--- a/extlibs/module-ports/vk_mem_alloc.cppm (revision 9c77f0d2cef4ee98c7946cd11e2e7f9ad4068ebb)
+++ b/extlibs/module-ports/vk_mem_alloc.cppm (date 1721578039193)
@@ -1,6 +1,6 @@
module;
#define VMA_IMPLEMENTATION
-#include <vk_mem_alloc.hpp>
+#include <vulkan-memory-allocator-hpp/vk_mem_alloc.hpp>
export module vk_mem_alloc_hpp;

export namespace VMA_HPP_NAMESPACE {
Index: cmake/config.cmake.in
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
--- a/cmake/config.cmake.in (revision 0e4f227c492f9f612e6c7e3ebb1bba70d34622c6)
+++ b/cmake/config.cmake.in (date 1721577186572)
--- a/cmake/config.cmake.in (revision 9c77f0d2cef4ee98c7946cd11e2e7f9ad4068ebb)
+++ b/cmake/config.cmake.in (date 1721578039190)
@@ -4,6 +4,6 @@

include(CMakeFindDependencyMacro)
find_dependency(Vulkan 1.3.256)
-find_dependency(VulkanMemoryAllocator-Hpp)
+find_dependency(unofficial-vulkan-memory-allocator-hpp)

check_required_components(@PROJECT_NAME@)
\ No newline at end of file
Index: CMakeLists.txt
Expand All @@ -39,15 +39,15 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision 0e4f227c492f9f612e6c7e3ebb1bba70d34622c6)
+++ b/CMakeLists.txt (date 1721577111233)
--- a/CMakeLists.txt (revision 9c77f0d2cef4ee98c7946cd11e2e7f9ad4068ebb)
+++ b/CMakeLists.txt (date 1721578039198)
@@ -28,7 +28,7 @@

find_package(Vulkan 1.3.256 REQUIRED)
find_package(VulkanMemoryAllocator CONFIG REQUIRED)
-find_package(VulkanMemoryAllocator-Hpp CONFIG REQUIRED)
+find_package(unofficial-vulkan-memory-allocator-hpp CONFIG REQUIRED)

# ----------------
# Module configurations for the external dependencies.
@@ -63,7 +63,7 @@
Expand Down

0 comments on commit d6a79ef

Please sign in to comment.