From 86c4d60fde0b80f065fb3391a83c52f81b3d5a5b Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 27 Jun 2023 11:49:04 +0200 Subject: Update the implementation of -unity-build I added the ability to use `-no-unity-build`, and included the batch size in the config.summary as well. In addition, qt_feature is not being used for `-unity-build` anymore. Change-Id: I4a10e03d3505336d2256280ed2854ec0425df47f Reviewed-by: Alexandru Croitor (cherry picked from commit f607e22d59e970f5016141ee4e70c834e64658dd) Reviewed-by: Qt Cherry-pick Bot --- configure.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 3b5382785a..db2be5307d 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1028,11 +1028,6 @@ qt_feature("ccache" CONDITION QT_USE_CCACHE ) qt_feature_config("ccache" QMAKE_PRIVATE_CONFIG) -qt_feature("unity-build" - LABEL "Unity Build" - AUTODETECT 1 - CONDITION QT_UNITY_BUILD -) qt_feature("static_runtime" LABEL "Statically link the C/C++ runtime library" AUTODETECT OFF @@ -1075,7 +1070,16 @@ qt_configure_add_summary_entry( CONDITION UNIX ) qt_configure_add_summary_entry( - ARGS "unity-build" + TYPE "message" ARGS "Unity Build" MESSAGE "yes" CONDITION QT_UNITY_BUILD +) +qt_configure_add_summary_entry( + TYPE "message" ARGS "Unity Build" MESSAGE "no" CONDITION NOT QT_UNITY_BUILD +) +qt_configure_add_summary_entry( + TYPE "message" + ARGS "Unity Build Batch Size" + MESSAGE "${QT_UNITY_BUILD_BATCH_SIZE}" + CONDITION QT_UNITY_BUILD ) qt_configure_add_summary_entry( TYPE "firstAvailableFeature" -- cgit v1.2.3