From 7b7dd85ca62dc53c21ea8272ff40aa60ce6288bf Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 20 Apr 2023 12:47:04 +0200 Subject: [PATCH] Enable Unity Build on QtBase for 3 Configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enabling the -unity-build for qtbase for INTEGRITY, Windows 10/11 MinGW. For now, we need to explicitly disable it for other modules, as QT_UNITY_BUILD is being propagated by `QtBuildInternalsExtra` to other modules. Task-number: QTBUG-109394 Change-Id: I38525706149eadba91bdebc78d502fd5f42f69aa Reviewed-by: Alexandru Croitor (OOO) Reviewed-by: Kai Köhne Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- coin/platform_configs/cmake_platforms.yaml | 8 ++++---- coin/platform_configs/integrity.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 64b90022..5128e3ac 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -243,11 +243,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_UNITY_BUILD=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', @@ -257,11 +257,11 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_UNITY_BUILD=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index d740656d..c1ac928c 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -8,9 +8,9 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', + 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli -unity-build', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF -DQT_UNITY_BUILD=OFF', 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',