diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-28 10:32:41 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-28 10:40:24 +0100 |
| commit | 96eb6a5f2c1652e4fa1c8941150d2778499d618d (patch) | |
| tree | 00f5c4ebb0fa9313b047f34588824360d653fd8e /coin | |
| parent | c4a012ba3d19b9cd986df6350e2ff6aa207749ce (diff) | |
CMake: Add DebugAndRelease feature to Ninja Multi-Config configs
This doubles the amount of processor power given to the VMs. This
mirrors what Coin does when it detects a -debug-and-release flag in
the configure flags when doing a qmake Qt build.
Change-Id: I33a5c6a50a4ac279d097664d145439c856f132ec
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 3228d5af..3dbcd0d3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -55,7 +55,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache'] + Features: ['Packaging', 'Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', @@ -63,7 +63,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' - Features: ['Insignificant', 'Sccache'] + Features: ['Insignificant', 'Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', @@ -91,7 +91,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-10.14-host' - Features: ['Packaging', 'Sccache'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Id: 'Windows10-Mingw8-x64-host' |