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

Ensure that libzstd targets are promoted to global if they were found

Browse Source 
Promote all internal zstd targets if they were found by WrapZSTD to
global using PROVIDED_TARGETS mechanism.

Amends 7d9d1220f367d9275dfaa7ce12e89b0a9f4c1978

Task-numer: QTBUG-119469
Pick-to: 6.5
Change-Id: I15ec484304f7bf2b3ee2a533d2badb3bb7797863
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 3073b9c4dec5e5877363794bf81cbd4b84fdb9ee)
This commit is contained in:
Alexey Edelev 2024-05-28 16:36:41 +02:00
parent d0aeeed49d
commit 0dd3e7008f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.cmake
View File

@ -113,7 +113,15 @@ SSL_free(SSL_new(0));
}
")
qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME global QMAKE_LIB zstd)
qt_find_package(WrapZSTD 1.3
PROVIDED_TARGETS
WrapZSTD::WrapZSTD
zstd::libzstd
zstd::libzstd_static
zstd::libzstd_shared
MODULE_NAME global
QMAKE_LIB zstd
)
qt_find_package(WrapDBus1 1.2 PROVIDED_TARGETS dbus-1 MODULE_NAME global QMAKE_LIB dbus)
qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev MODULE_NAME global QMAKE_LIB libudev)
qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME core QMAKE_LIB lttng-ust)