From: Lisandro Damián Nicanor Pérez Meyer Date: Sat, 28 Oct 2023 09:26:45 +0000 (+0200) Subject: force the usage of the shared libzstd library. X-Git-Tag: archive/raspbian/6.4.2+dfsg-19+rpi1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6d590b8e28631aac2abac9612038de1216eb505;p=qt6-base.git force the usage of the shared libzstd library. Bug: https://bugreports.qt.io/browse/QTBUG-110978 Forwarded: not-needed The library provides both versions, and the original code prefers the static version over the shared, while on Debian it should always use the shared version. Gbp-Pq: Name force_shared_libzstd.patch --- diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake index d088e94c..de32527b 100644 --- a/cmake/FindWrapZSTD.cmake +++ b/cmake/FindWrapZSTD.cmake @@ -25,11 +25,8 @@ include(FindPackageHandleStandardArgs) if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared) find_package_handle_standard_args(WrapZSTD REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION) - if(TARGET zstd::libzstd_static) - set(zstdtargetsuffix "_static") - else() - set(zstdtargetsuffix "_shared") - endif() + set(zstdtargetsuffix "_shared") + if(NOT TARGET WrapZSTD::WrapZSTD) add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED) set_target_properties(WrapZSTD::WrapZSTD PROPERTIES