1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer using the non-suffixed libzstd over static one

Browse Source 
Recent zstd versions provide the libstd target but not only libzstd_shared
or libzstd_static. Attempt to use it as the WrapZSTD::WrapZSTD counterpart
if the target exists.

Task-number: QTBUG-119469
Pick-to: 6.5
Change-Id: I47916bfa6f10883d099184a497800277c8026b14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7d9d1220f367d9275dfaa7ce12e89b0a9f4c1978)
This commit is contained in:
Alexey Edelev 2024-05-27 11:09:05 +02:00
parent 0dd3e7008f
commit 565cd685ab
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindWrapZSTD.cmake
View File

@ -25,14 +25,17 @@ find_package(zstd CONFIG QUIET)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared) if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared OR TARGET zstd::libzstd)
find_package_handle_standard_args(WrapZSTD find_package_handle_standard_args(WrapZSTD
REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION) REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION)
if(TARGET zstd::libzstd_shared) if(TARGET zstd::libzstd_shared)
set(zstdtargetsuffix "_shared") set(zstdtargetsuffix "_shared")
elseif(TARGET zstd::libzstd)
set(zstdtargetsuffix "")
else() else()
set(zstdtargetsuffix "_static") set(zstdtargetsuffix "_static")
endif() endif()
if(NOT TARGET WrapZSTD::WrapZSTD) if(NOT TARGET WrapZSTD::WrapZSTD)
add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED) add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
set_target_properties(WrapZSTD::WrapZSTD PROPERTIES set_target_properties(WrapZSTD::WrapZSTD PROPERTIES