From 6f3ff63da5df242433e532a131736f8d1f964a78 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 3 Jul 2023 14:27:04 +0200 Subject: [PATCH] Enable Unity Build on Qt Base for macOS -developer-build In order to monitor, and compare the performance of unity build, this patch enables the unity build on `macos-12-arm64-developer-build` and `macos-12-arm64-developer-build` platforms. Change-Id: I4d8f864a821cf4cefcc10015950d0e994c7ba8a4 Reviewed-by: Alexey Edelev --- coin/platform_configs/macos.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 9e440f2e..e07a324c 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -100,10 +100,10 @@ Configurations: Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' + Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples -unity-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_UNITY_BUILD=OFF', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - @@ -111,10 +111,10 @@ Configurations: Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework -unity-build' Environment variables: [ 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_UNITY_BUILD=OFF', ] # Note: We do not include OpenSSL or PostgreSQL in this build, # as the M1 CI machines are not provisioned for that yet.