diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-18 21:54:27 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-19 20:44:51 +0100 |
| commit | 610123b1c8fa5f8f376b15659cd671936eb79ec5 (patch) | |
| tree | 37f439c8b43c040c116285f89a51a10acd9be853 | |
| parent | d29f76f5e5bada4badcd9db8bf3fb15ff4ba3012 (diff) | |
Move the 'qmake' feature to src/tools/configure.cmake
This allows us to present 'qmake' in the tool-related section of the
configure summary.
Change-Id: I897dec23cb0608706ec01d9b91283dbce92b293f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | qmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qmake/configure.cmake | 12 | ||||
| -rw-r--r-- | qt_cmdline.cmake | 1 | ||||
| -rw-r--r-- | src/tools/configure.cmake | 7 |
4 files changed, 7 insertions, 17 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 6a37fb981c..6eae6ecd39 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -43,10 +43,6 @@ target_compile_definitions(QtLibraryInfo PUBLIC QT_HOST_DATADIR="${hostdatadir}" ) -# qmake is out of any module, so we manually evaluate the required features. -include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake") -qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake") - if(NOT QT_FEATURE_qmake) return() endif() diff --git a/qmake/configure.cmake b/qmake/configure.cmake deleted file mode 100644 index f1b839dcef..0000000000 --- a/qmake/configure.cmake +++ /dev/null @@ -1,12 +0,0 @@ -qt_feature("qmake" PRIVATE - SECTION "Core tools" - LABEL "qmake tool" - PURPOSE "The qmake tool helps simplify the build process for development projects across different platforms" - CONDITION QT_FEATURE_settings AND QT_FEATURE_alloca AND - (QT_FEATURE_alloca_malloc_h OR NOT WIN32) AND QT_FEATURE_cborstreamwriter AND - QT_FEATURE_datestring AND QT_FEATURE_regularexpression AND QT_FEATURE_temporaryfile -) - -qt_configure_add_summary_section(NAME "Core tools") -qt_configure_add_summary_entry(ARGS "qmake") -qt_configure_end_summary_section() diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index f819a2bc14..6627788a0a 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -8,7 +8,6 @@ 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) qt_commandline_option(extprefix TYPE string) diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake index d4f7915e7b..bee8a90ef7 100644 --- a/src/tools/configure.cmake +++ b/src/tools/configure.cmake @@ -4,6 +4,13 @@ qt_feature("androiddeployqt" PRIVATE PURPOSE "The Android deployment tool automates the process of creating Android packages." CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression) +qt_feature("qmake" PRIVATE + PURPOSE "The qmake tool helps simplify the build process for development projects across different platforms." + CONDITION QT_FEATURE_settings AND QT_FEATURE_alloca AND + (QT_FEATURE_alloca_malloc_h OR NOT WIN32) AND QT_FEATURE_cborstreamwriter AND + QT_FEATURE_datestring AND QT_FEATURE_regularexpression AND QT_FEATURE_temporaryfile) + qt_configure_add_summary_section(NAME "Core tools") qt_configure_add_summary_entry(ARGS "androiddeployqt") +qt_configure_add_summary_entry(ARGS "qmake") qt_configure_end_summary_section() |