mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-19 11:36:12 +08:00
Enable Unity Build on Qt Base for LLVM, and MinGW on Windows
Enable unity build for LLVM, and the last MinGW platforms on Windows. Change-Id: I9f36ca8b0268f13886e319ea3211744fc377bc69 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
@@ -225,11 +225,11 @@ Configurations:
|
|||||||
Template: 'qtci-windows-10_22H2-x86_64-51'
|
Template: 'qtci-windows-10_22H2-x86_64-51'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['Sccache', 'UseConfigure']
|
Features: ['Sccache', 'UseConfigure']
|
||||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
|
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
||||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
'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}}',
|
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_UNITY_BUILD=OFF',
|
||||||
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
||||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
||||||
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
|
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
|
||||||
@@ -239,11 +239,11 @@ Configurations:
|
|||||||
Template: 'qtci-windows-11_22H2-x86_64-50'
|
Template: 'qtci-windows-11_22H2-x86_64-50'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['Sccache', 'UseConfigure']
|
Features: ['Sccache', 'UseConfigure']
|
||||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
|
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
||||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
'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}}',
|
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_UNITY_BUILD=OFF',
|
||||||
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
||||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
||||||
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
|
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
|
||||||
|
|||||||
Reference in New Issue
Block a user