diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/corelib/qt_cmdline.cmake | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 61e960dcf2..7bb3782313 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1250,7 +1250,21 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) endif() endif() - if(QT_FEATURE_zstd) + if(DEFINED INPUT_mimetype_database_compression) + set(supported_compression_types zstd gzip none) + if(INPUT_mimetype_database_compression IN_LIST supported_compression_types) + set(compression_type ${INPUT_mimetype_database_compression}) + else() + message(FATAL_ERROR "Unknown mime type database compression is set:" + " ${INPUT_mimetype_database_compression}\nSupported compression types:\n" + " ${supported_compression_types}") + endif() + if(compression_type STREQUAL "zstd" AND NOT QT_FEATURE_zstd) + message(FATAL_ERROR + "zstd compression is selected for mime type database, but the 'zstd'" + " feature is disabled.") + endif() + elseif(QT_FEATURE_zstd) set(compression_type "zstd") else() set(compression_type "gzip") diff --git a/src/corelib/qt_cmdline.cmake b/src/corelib/qt_cmdline.cmake index dcf9ce946e..c82d77a60d 100644 --- a/src/corelib/qt_cmdline.cmake +++ b/src/corelib/qt_cmdline.cmake @@ -9,6 +9,7 @@ qt_commandline_option(inotify TYPE boolean) qt_commandline_option(journald TYPE boolean) qt_commandline_option(libb2 TYPE enum VALUES no qt system) qt_commandline_option(mimetype-database TYPE boolean) +qt_commandline_option(mimetype-database-compression TYPE optionalString VALUES zstd gzip none) qt_commandline_option(pcre TYPE enum VALUES no qt system) qt_commandline_option(posix-ipc TYPE boolean NAME ipc_posix) qt_commandline_option(pps TYPE boolean NAME qqnx_pps) |