From 3e37984a4f7c7590341fcf8de444483689ec2bf8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 6 Nov 2020 12:09:12 +0100 Subject: [PATCH] CMake: Add possibility to opt-out of file(ARCHIVE_CREATE) usage If CMake 3.18 was built with insufficient library dependencies then Qt's build will fail when file(ARCHIVE_CREATE) is called. Configure with -DQT_AVOID_CMAKE_ARCHIVING_API=ON to choose code paths were file(ARCHIVE_*) is not used. Change-Id: I30c390498337ab0fa78b88b66d2f8feaa1f3f10b Reviewed-by: Alexandru Croitor --- src/corelib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index bb005b189d1..3516bf54c64 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1150,7 +1150,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) # Generate qmimeprovider_database.cpp set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp") - if(CMAKE_VERSION VERSION_LESS 3.18) + if(CMAKE_VERSION VERSION_LESS 3.18 OR QT_AVOID_CMAKE_ARCHIVING_API) set(command_args "") set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime") set(command_depends "${mime_dir}/generate.pl" "${corelib_mimetypes_resource_file}")