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

Add configure feature 'androiddeployqt'

Browse Source 
This makes it possible to turn off the build of the Android deployment
tool.

A new src/tools/configure.cmake is added that will be the place for all
tool-related features in qtbase.

Change-Id: Ic9264c93ee96de06c97d21d2f27f73256f48ffda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-11-18 21:42:59 +01:00
parent 18aff2b424
commit d29f76f5e5
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qt_cmdline.cmake
View File

@ -7,6 +7,7 @@ qt_commandline_subconfig(src/widgets)
qt_commandline_subconfig(src/printsupport)
qt_commandline_subconfig(src/plugins/sqldrivers)
qt_commandline_subconfig(src/testlib)
qt_commandline_subconfig(src/tools)
qt_commandline_subconfig(qmake) # special case
qt_commandline_custom(qmakeArgs)
qt_commandline_option(prefix TYPE string)

8
src/tools/CMakeLists.txt
View File

@ -1,3 +1,8 @@
# The configure.cmake here does not get picked up automatically.
# Manually evaluate tool-related features.
include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
add_subdirectory(uic)
if (QT_FEATURE_dbus)
add_subdirectory(qdbuscpp2xml)
@ -9,8 +14,7 @@ if (QT_FEATURE_commandlineparser)
add_subdirectory(qtpaths)
endif()
# Only include the following tools when performing a host build
if(NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
if(QT_FEATURE_androiddeployqt)
add_subdirectory(androiddeployqt)
if(QT_FEATURE_gui AND QT_FEATURE_systemsemaphore)
add_subdirectory(androidtestrunner)

9
src/tools/configure.cmake Normal file
View File

@ -0,0 +1,9 @@
qt_feature("androiddeployqt" PRIVATE
SECTION "Deployment"
LABEL "Android deployment tool"
PURPOSE "The Android deployment tool automates the process of creating Android packages."
CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
qt_configure_add_summary_section(NAME "Core tools")
qt_configure_add_summary_entry(ARGS "androiddeployqt")
qt_configure_end_summary_section()