diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-10-17 13:29:13 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-10-18 13:24:56 +0300 |
| commit | abafe6d2e1b96fd5899854e7e4dd8c2827c774bd (patch) | |
| tree | 8657630afa2f468c73c14859f933058ec25b3963 /src/libs | |
| parent | a4c2e924d74328ee5908beb16158c931cfe5d76b (diff) | |
libarchive: support linking with zlib compiled into QtCore
This removes the requirement of provisioning an external library just
for libarchive - as the official IFW binaries already use the zlib
bundled with Qt - and tracking updates from multiple sources.
Task-number: QTIFW-2803
Change-Id: I9878a3e1a9b5d649bc62590746151e2d5fe903ba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/3rdparty/libarchive/libarchive.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/3rdparty/libarchive/libarchive.pro b/src/libs/3rdparty/libarchive/libarchive.pro index a647d6572..0cf6f3097 100644 --- a/src/libs/3rdparty/libarchive/libarchive.pro +++ b/src/libs/3rdparty/libarchive/libarchive.pro @@ -166,6 +166,10 @@ SOURCES += $$PWD/archive_acl.c \ $$PWD/filter_fork_posix.c \ $$PWD/xxhash.c +if (isEmpty(IFW_ZLIB_LIBRARY):contains(QT_MODULES, zlib)) { + INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib +} + linux { INCLUDEPATH += ./config/linux HEADERS += $$PWD/config/linux/config.h |