[cmake] fix unordered-dense deps (#380)

Signed-off-by: lizzie <lizzie@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/380
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>

5 files changed, 21 insertions, 28 deletions

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f66423a672..e917e4e7d8 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -96,15 +96,7 @@ if (ENABLE_WEB_SERVICE)
 endif()
 
 # unordered_dense
-AddPackage(
-    NAME unordered_dense
-    REPO "Lizzie841/unordered_dense"
-    SHA e59d30b7b1
-    HASH 71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0
-    FIND_PACKAGE_ARGUMENTS "CONFIG"
-    OPTIONS
-        "UNORDERED_DENSE_INSTALL OFF"
-)
+AddJsonPackage(unordered-dense)
 
 # FFMpeg
 if (YUZU_USE_BUNDLED_FFMPEG)
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index bbc6b056c1..4bc4a97ca4 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -105,5 +105,18 @@
         "sha": "2bc873e53c",
         "hash": "02329058a7f9cf7d5039afaae5ab170d9f42f60f4c01e21eaf4f46073886922b057a9ae30eeac040b3ac182f51b9c1bfe9fe1050a2c9f6ce567a1a9a0ec2c768",
         "bundled": true
+    },
+    "unordered-dense": {
+        "package": "unordered_dense",
+        "repo": "martinus/unordered_dense",
+        "sha": "73f3cbb237",
+        "hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
+        "find_args": "CONFIG",
+        "options": [
+            "UNORDERED_DENSE_INSTALL OFF"
+        ],
+        "patches": [
+            "0001-cmake.patch"
+        ]
     }
 }
diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txt
index 23cfd42236..73c97d8f06 100644
--- a/src/dynarmic/externals/CMakeLists.txt
+++ b/src/dynarmic/externals/CMakeLists.txt
@@ -60,12 +60,12 @@ AddJsonPackage(
 #     endif()
 # endif()
 
-# unordered_dense
+# unordered_dense - already in root
 
-AddJsonPackage(
-    NAME unordered-dense
-    BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
-)
+# AddJsonPackage(
+#     NAME unordered-dense
+#     BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
+# )
 
 # xbyak
 # uncomment if in an independent repo
diff --git a/src/dynarmic/externals/cpmfile.json b/src/dynarmic/externals/cpmfile.json
index cebcdf5232..e9406cbe81 100644
--- a/src/dynarmic/externals/cpmfile.json
+++ b/src/dynarmic/externals/cpmfile.json
@@ -14,19 +14,6 @@
             "MCL_INSTALL OFF"
         ]
     },
-    "unordered-dense": {
-        "package": "unordered_dense",
-        "repo": "martinus/unordered_dense",
-        "sha": "e59d30b7b1",
-        "hash": "71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0",
-        "find_args": "CONFIG",
-        "options": [
-            "UNORDERED_DENSE_INSTALL OFF"
-        ],
-        "patches": [
-            "0001-cmake.patch"
-        ]
-    },
     "zycore": {
         "package": "Zycore",
         "repo": "zyantific/zycore-c",
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 89fe7a35f9..8131d42aae 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -332,7 +332,8 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
 add_dependencies(video_core host_shaders)
 target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
 
-target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
+target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders)
+target_link_libraries(video_core PUBLIC GPUOpen::VulkanMemoryAllocator)
 
 if (ENABLE_NSIGHT_AFTERMATH)
     if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})