From b818cc682c21ab700de3613fdb8710c701a1dbeb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 28 Mar 2018 17:00:49 -0400 Subject: [PATCH] VideoCommon/Vulkan: Explicitly link in xxhash Lessens the dependency on the LIBS variable (and also makes the required libraries explicit). --- CMakeLists.txt | 1 - Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 6 +++++- Source/Core/VideoCommon/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d7b4b8c47..7027dfbb10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -588,7 +588,6 @@ if(NOT XXHASH_FOUND) add_subdirectory(Externals/xxhash) include_directories(Externals/xxhash) endif() -LIST(APPEND LIBS xxhash) find_package(ZLIB) if(ZLIB_FOUND) diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index fe29abe7b1..4e24d82add 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -41,5 +41,9 @@ include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV) # Link against glslang, the other necessary libraries are referenced by the executable. add_dolphin_library(videovulkan "${SRCS}" "${LIBS}") -target_link_libraries(videovulkan PRIVATE glslang) +target_link_libraries(videovulkan +PRIVATE + glslang + xxhash +) diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 6fddab82bd..5cf64ec74f 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -64,6 +64,7 @@ PUBLIC core PRIVATE png + xxhash ) if(_M_X86)