Merge pull request #6556 from lioncash/video-libs

VideoCommon/Vulkan: Explicitly link in xxhash
2018-03-29 13:25:30 +02:00 · 2018-03-29 13:25:30 +02:00 · c697b7d435
parent 03a6a9b240 b818cc682c
commit c697b7d435
3 changed files with 6 additions and 2 deletions
--- 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)
--- 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
+)

--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@ -64,6 +64,7 @@ PUBLIC
  core
 PRIVATE
  png
+  xxhash
 )

 if(_M_X86)