diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-13 10:06:54 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-16 14:33:28 +0200 |
| commit | 879f86098ec1917279315f16f7f2fa2393096fe9 (patch) | |
| tree | 34c6ca7a3598aa43ce43f06b37544d53c0dcbff6 /src/tools | |
| parent | 896f71d500ecd6e2ea3a32e80bbb4faa70fd2684 (diff) | |
Remove zlib from bootstrap library
None of the bootstrapped tools use zlib anymore.
Change-Id: I2cd7cb855ed671916a21c23449d9b6c4506f8546
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/tools/cmake_automoc_parser/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/moc/CMakeLists.txt | 1 |
3 files changed, 0 insertions, 28 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 393ef7e1c2..974342ae55 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -243,32 +243,6 @@ qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_pcre2 AND NOT CM WrapPCRE2::WrapPCRE2 ) -qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib - SOURCES - ../../3rdparty/zlib/src/adler32.c - ../../3rdparty/zlib/src/compress.c - ../../3rdparty/zlib/src/crc32.c - ../../3rdparty/zlib/src/deflate.c - ../../3rdparty/zlib/src/gzclose.c - ../../3rdparty/zlib/src/gzlib.c - ../../3rdparty/zlib/src/gzread.c - ../../3rdparty/zlib/src/gzwrite.c - ../../3rdparty/zlib/src/infback.c - ../../3rdparty/zlib/src/inffast.c - ../../3rdparty/zlib/src/inflate.c - ../../3rdparty/zlib/src/inftrees.c - ../../3rdparty/zlib/src/trees.c - ../../3rdparty/zlib/src/uncompr.c - ../../3rdparty/zlib/src/zutil.c - INCLUDE_DIRECTORIES - ../../3rdparty/zlib/src -) - -qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING - LIBRARIES - WrapZLIB::WrapZLIB -) - qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index f50b8368e7..927d54a2fd 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -13,7 +13,6 @@ qt_internal_add_tool(${target_name} QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY - QT_NO_COMPRESS QT_NO_FOREACH INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index fedf27374b..bb39145b46 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -27,7 +27,6 @@ qt_internal_add_tool(${target_name} QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY - QT_NO_COMPRESS QT_NO_FOREACH INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} |