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

Move the 'qmake' feature to src/tools/configure.cmake

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2021-11-18 21:54:27 +01:00
parent d29f76f5e5
commit 610123b1c8
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/CMakeLists.txt
View File

@ -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()

12
qmake/configure.cmake
View File

@ -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()

1
qt_cmdline.cmake
View File

@ -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)

7
src/tools/configure.cmake
View File

@ -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()