Browse Source

fix libzstd link

httplib was linking to zstd::libzstd, which unconditionally links to the
shared version of zstd. Not even a setting or anything. :/ so let's just
override INTERFACE_LINK_LIBRARIES

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3308/head
crueter 3 weeks ago
parent
commit
3158ad3efc
  1. 6
      CMakeModules/Findzstd.cmake
  2. 6
      src/common/CMakeLists.txt

6
CMakeModules/Findzstd.cmake

@ -14,8 +14,7 @@ else()
pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
find_package_handle_standard_args(zstd
REQUIRED_VARS ZSTD_LINK_LIBRARIES
VERSION_VAR ZSTD_VERSION
)
VERSION_VAR ZSTD_VERSION)
endif()
if (zstd_FOUND AND NOT TARGET zstd::zstd)
@ -36,4 +35,7 @@ if (NOT TARGET zstd::libzstd)
else()
add_library(zstd::libzstd ALIAS zstd::zstd)
endif()
elseif(YUZU_STATIC_BUILD AND TARGET zstd::libzstd_static)
# zstd::libzstd links to shared zstd by default
set_target_properties(zstd::libzstd PROPERTIES INTERFACE_LINK_LIBRARIES zstd::libzstd_static)
endif()

6
src/common/CMakeLists.txt

@ -220,8 +220,7 @@ else()
stb.cpp
PROPERTIES
COMPILE_OPTIONS
"-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers"
)
"-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers")
# Get around GCC failing with intrinsics in Debug
if(CXX_GCC AND CMAKE_BUILD_TYPE MATCHES "Debug")
@ -240,8 +239,7 @@ if(CXX_CLANG)
PRIVATE
# Clang 14 and earlier have errors when explicitly instantiating
# Settings::Setting
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
)
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>)
endif()
if (BOOST_NO_HEADERS)

Loading…
Cancel
Save