1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add possibility to opt-out of file(ARCHIVE_CREATE) usage

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-11-06 12:09:12 +01:00
parent 2746051522
commit 3e37984a4f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/CMakeLists.txt
View File

@ -1150,7 +1150,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
# Generate qmimeprovider_database.cpp # Generate qmimeprovider_database.cpp
set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/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(command_args "")
set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime") set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime")
set(command_depends "${mime_dir}/generate.pl" "${corelib_mimetypes_resource_file}") set(command_depends "${mime_dir}/generate.pl" "${corelib_mimetypes_resource_file}")