From 4ffec4a809bbe7484a699b8cace8f08805652d66 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 21 Jul 2023 07:57:12 +0200 Subject: [PATCH] Revert "Enable Unity Build on Qt Base for LLVM, and MinGW on Windows" This reverts commit d1496ac752fc7cd4775a3fa45b704a775aa62fa9. Unity builds have not been properly tested. In particular, they have not been tested with an "infinite" batch-size (e.g. 100,000) to reasonably ensure that any batch-size will work and any _new_ .cpp files being added to SOURCES will break unity-build only in a way that's fixable by changes in _that_ .cpp file. The CI is not a lab for experiments. A unity-related failure has brought the branch:dev CI to a screeching halt for a day on 2023-07-20, so we're disabling the use of it on the CI until it has been properly tested in nightly builds and locally. Task-number: QTBUG-109394 Change-Id: I935879b6b8a9602fcfbfcaa1d38b0b08254e0f59 Reviewed-by: Volker Hilsheimer --- coin/platform_configs/cmake_platforms.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index ca522876..f099b73c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -228,11 +228,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}', 'LLVM_INSTALL_DIR=C:\llvm-mingw', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}', @@ -242,11 +242,11 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}', 'LLVM_INSTALL_DIR=C:\llvm-mingw', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',