From d29f76f5e5bada4badcd9db8bf3fb15ff4ba3012 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 18 Nov 2021 21:42:59 +0100 Subject: [PATCH] Add configure feature 'androiddeployqt' 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 --- qt_cmdline.cmake | 1 + src/tools/CMakeLists.txt | 8 ++++++-- src/tools/configure.cmake | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/tools/configure.cmake diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 1bb83faaf80..f819a2bc144 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -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) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index e30c246d38e..247b0193e61 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -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) diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake new file mode 100644 index 00000000000..d4f7915e7bb --- /dev/null +++ b/src/tools/configure.cmake @@ -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()