From 879f86098ec1917279315f16f7f2fa2393096fe9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 13 Oct 2021 10:06:54 +0200 Subject: Remove zlib from bootstrap library None of the bootstrapped tools use zlib anymore. Change-Id: I2cd7cb855ed671916a21c23449d9b6c4506f8546 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor Reviewed-by: Thiago Macieira --- src/corelib/global/qconfig-bootstrapped.h | 2 ++ src/tools/bootstrap/CMakeLists.txt | 26 -------------------------- src/tools/cmake_automoc_parser/CMakeLists.txt | 1 - src/tools/moc/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 4d3f88e071..090dde8312 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -136,6 +136,8 @@ #define QT_NO_TRANSLATION #define QT_FEATURE_translation -1 +#define QT_NO_COMPRESS + // rcc.pro will DEFINES+= this #ifndef QT_FEATURE_zstd #define QT_FEATURE_zstd -1 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} -- cgit v1.2.3