From 518d4f10dadf0dcf812a6b949c8febdb0bb93a58 Mon Sep 17 00:00:00 2001 From: Kirill Burtsev Date: Fri, 25 Jun 2021 14:11:05 +0200 Subject: Support more module flags for 'configure' script Support flags passed to main 'configure' and separate 'qt-configure-module' scripts with flags like '-no-build-qtpdf', '-webengine-full-debug-info', '-no-webengine-jumbo-build', etc. Fixes: QTBUG-95717 Pick-to: 6.2 6.2.0 Change-Id: Ia12602e9a9b31f4f2256f983f6c1e3fbe50cb9e3 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Michal Klocek --- configure.cmake | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index b803548bf..172831c69 100644 --- a/configure.cmake +++ b/configure.cmake @@ -226,6 +226,27 @@ qt_feature("webengine-system-gn" PRIVATE AUTODETECT FALSE CONDITION Gn_FOUND ) +# default assumed merge limit (should match the one in qt_cmdline.cmake) +set(jumbo_merge_limit 8) +# check value provided through configure script with -webengine-jumbo-build=(on|off|32) +if(DEFINED INPUT_webengine_jumbo_file_merge_limit) + set(jumbo_merge_limit ${INPUT_webengine_jumbo_file_merge_limit}) +# then also verify if set directly with cmake call and -DFEATURE_webengine_jumbo_build=(ON|OFF|32) +elseif(DEFINED FEATURE_webengine_jumbo_build) + if(FEATURE_webengine_jumbo_build GREATER 0) + set(jumbo_merge_limit ${FEATURE_webengine_jumbo_build}) + elseif (NOT FEATURE_webengine_jumbo_build) + set(jumbo_merge_limit 0) + endif() +endif() +set(QT_FEATURE_webengine_jumbo_file_merge_limit ${jumbo_merge_limit} + CACHE STRING "Jumbo merge limit for WebEngineCore" FORCE) +qt_feature("webengine-jumbo-build" PUBLIC + LABEL "Jumbo Build" + PURPOSE "Enables support for jumbo build of core library" + AUTODETECT FALSE + ENABLE jumbo_merge_limit GREATER 0 +) qt_feature("webengine-developer-build" PRIVATE LABEL "Developer build" PURPOSE "Enables the developer build configuration." @@ -442,9 +463,10 @@ add_check_for_support( #### Summary # > Qt WebEngine Build Features -qt_configure_add_summary_section(NAME "Build Features") +qt_configure_add_summary_section(NAME "Qt WebEngine") qt_configure_add_summary_entry(ARGS "webengine-system-ninja") qt_configure_add_summary_entry(ARGS "webengine-system-gn") +qt_configure_add_summary_entry(ARGS "webengine-jumbo-build") qt_configure_add_summary_entry(ARGS "webengine-developer-build") # >> Optional system libraries if(UNIX) -- cgit v1.2.1