From 1f8f13cbe7a3a015ae62ff1524b22422adc9e094 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 1 Feb 2021 19:35:41 +0100 Subject: Add the 'FEATURE_qmake' feature Add a conditional build of the qmake. Task-number: QTBUG-89369 Change-Id: I8d7968ffb20ea31df2f85fff055e0d131ed06a36 Reviewed-by: Joerg Bornemann --- qmake/CMakeLists.txt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'qmake/CMakeLists.txt') diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 9cf6a3a4b5..2a46a6f3c8 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -4,20 +4,11 @@ ## qmake Tool: ##################################################################### -# TODO: Probably it's time to introduce QT_FEATURE_qmake? -if(NOT (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)) - message(WARNING "Skip building qmake in specified configuration.\ -Required features: - QT_FEATURE_settings ${QT_FEATURE_settings} - QT_FEATURE_alloca ${QT_FEATURE_alloca} - QT_FEATURE_cborstreamwriter ${QT_FEATURE_cborstreamwriter} - QT_FEATURE_datestring ${QT_FEATURE_datestring} - QT_FEATURE_getauxval ${QT_FEATURE_getauxval} - QT_FEATURE_regularexpression ${QT_FEATURE_regularexpression} - QT_FEATURE_temporaryfile ${QT_FEATURE_temporaryfile} -") +# 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() -- cgit v1.2.3