From cab6e7c12e280be05995655ea9a3a458466dd849 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sat, 6 Jul 2024 16:56:44 -0500 Subject: [PATCH] Properly link against xxhash Things using dolphin_find_optional_system_library need to link against the name used there or they won't work with both the system and bundled cases --- Externals/xxhash/CMakeLists.txt | 1 + Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 2 +- Source/Core/VideoCommon/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Externals/xxhash/CMakeLists.txt b/Externals/xxhash/CMakeLists.txt index c275795083..a874dc4e90 100644 --- a/Externals/xxhash/CMakeLists.txt +++ b/Externals/xxhash/CMakeLists.txt @@ -6,3 +6,4 @@ target_include_directories(xxhash PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xxHash ) +add_library(xxhash::xxhash ALIAS xxhash) diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index a41c5af172..c4fbd847e1 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -45,7 +45,7 @@ PUBLIC PRIVATE # Link against glslang, the other necessary libraries are referenced by the executable. glslang - xxhash + xxhash::xxhash ) if (ANDROID AND _M_ARM_64) diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 89ec66d048..e24680185e 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -214,7 +214,7 @@ PUBLIC PRIVATE fmt::fmt spng::spng - xxhash + xxhash::xxhash imgui implot glslang