diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-03 16:03:45 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-03 14:16:23 +0000 |
| commit | 6b2de61bf973dc8c0f245ba4dfdb791faa15b428 (patch) | |
| tree | 76d93491bbeb2546a9600d1400d8a92fa752c057 | |
| parent | a907d7df3488764b74afd219e1ddd368062529d6 (diff) | |
Make zlib a required package for QtCore
Change-Id: Ifbb969fafe05e355d6874d8bebe2e8f1e80510ff
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | configure.cmake | 1 | ||||
| -rw-r--r-- | util/cmake/helper.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 3c86c89f95..92e4198add 100644 --- a/configure.cmake +++ b/configure.cmake @@ -7,6 +7,7 @@ #### Libraries qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB) +set_package_properties(ZLIB PROPERTIES TYPE REQUIRED) qt_find_package(ZSTD PROVIDED_TARGETS ZSTD::ZSTD) qt_find_package(DBus1 PROVIDED_TARGETS dbus-1) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev) diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 99a518bf0c..b58c73dae8 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -241,7 +241,7 @@ _library_map = [ LibraryMapping('xkbcommon', 'XKB', 'XKB::XKB', extra = ['0.4.1']), LibraryMapping('xlib', 'X11', 'X11::XCB'), # FIXME: Is this correct? LibraryMapping('xrender', 'XRender', 'PkgConfig::xrender'), - LibraryMapping('zlib', 'ZLIB', 'ZLIB::ZLIB'), + LibraryMapping('zlib', 'ZLIB', 'ZLIB::ZLIB', extra=['REQUIRED']), LibraryMapping('zstd', 'ZSTD', 'ZSTD::ZSTD'), ] |