diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-25 14:11:05 +0200 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-09-09 13:39:43 +0200 |
| commit | 518d4f10dadf0dcf812a6b949c8febdb0bb93a58 (patch) | |
| tree | a27f2bebe71a440bae76c8a9a828b9502e5b2f1a /configure.cmake | |
| parent | 3519dd6ad32053f508601e3b5f18f016d3edb000 (diff) | |
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 <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 24 |
1 files changed, 23 insertions, 1 deletions
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) |