Missing libraries.

stripe2933 · Jul 20, 2024 · e129be5 · e129be5
1 parent fe4beb5
commit e129be5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -37,7 +37,7 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Apply patch for vcpkg-based dependency management
-        run: git apply vcpkg-deps-patch.patch
+        run: git apply vcpkg-deps.patch
 
       - name: Configure
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,7 +39,7 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Apply patch for vcpkg-based dependency management
-        run: git apply vcpkg-deps-patch.patch
+        run: git apply vcpkg-deps.patch
 
       - name: Configure
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,7 @@ set(CMAKE_CXX_STANDARD 23)
 # ----------------
 
 find_package(Vulkan 1.3.256 REQUIRED)
+find_package(VulkanMemoryAllocator CONFIG REQUIRED)
 find_package(VulkanMemoryAllocator-Hpp CONFIG REQUIRED)
 
 # ----------------
@@ -46,7 +47,11 @@ if (NOT TARGET VulkanMemoryAllocator-Hpp_module)
             FILES extlibs/module-ports/vk_mem_alloc.cppm
     )
     target_compile_features(VulkanMemoryAllocator-Hpp_module PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
-    target_link_libraries(VulkanMemoryAllocator-Hpp_module PUBLIC Vulkan::Vulkan VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp)
+    target_link_libraries(VulkanMemoryAllocator-Hpp_module PUBLIC
+        Vulkan::Vulkan
+        GPUOpen::VulkanMemoryAllocator
+        VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp
+    )
 
     add_library(VulkanMemoryAllocator-Hpp::module ALIAS VulkanMemoryAllocator-Hpp_module)
 endif()

diff --git a/vcpkg-deps-patch.patch → vcpkg-deps.patch b/vcpkg-deps-patch.patch → vcpkg-deps.patch
@@ -6,8 +6,8 @@ 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 500bd6d8c17cd5cd92a609d516331e3c4b7f6941)
-+++ b/extlibs/module-ports/vk_mem_alloc.cppm	(date 1721481492856)
+--- a/extlibs/module-ports/vk_mem_alloc.cppm	(revision 9ce74395ceab83fe55a4ae8ee8a6b8020e832542)
++++ b/extlibs/module-ports/vk_mem_alloc.cppm	(date 1721481973172)
 @@ -1,6 +1,6 @@
  module;
  #define VMA_IMPLEMENTATION
@@ -22,23 +22,23 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	(revision 500bd6d8c17cd5cd92a609d516331e3c4b7f6941)
-+++ b/CMakeLists.txt	(date 1721481492861)
-@@ -13,7 +13,7 @@
- # ----------------
+--- a/CMakeLists.txt	(revision 9ce74395ceab83fe55a4ae8ee8a6b8020e832542)
++++ b/CMakeLists.txt	(date 1721481973176)
+@@ -14,7 +14,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.
-@@ -46,7 +46,7 @@
-             FILES extlibs/module-ports/vk_mem_alloc.cppm
+@@ -50,7 +50,7 @@
+     target_link_libraries(VulkanMemoryAllocator-Hpp_module PUBLIC
+         Vulkan::Vulkan
+         GPUOpen::VulkanMemoryAllocator
+-        VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp
++        unofficial::VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp
      )
-     target_compile_features(VulkanMemoryAllocator-Hpp_module PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
--    target_link_libraries(VulkanMemoryAllocator-Hpp_module PUBLIC Vulkan::Vulkan VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp)
-+    target_link_libraries(VulkanMemoryAllocator-Hpp_module PUBLIC Vulkan::Vulkan unofficial::VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp)
 
      add_library(VulkanMemoryAllocator-Hpp::module ALIAS VulkanMemoryAllocator-Hpp_module)
- endif()