From 5cd8e9576d453a6d70d110fc0cdc1b9d29dd0365 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 May 2020 17:09:56 +0200 Subject: CMake: Switch qtbase Windows config to use Ninja Multi-Config And configure with two configurations, RelWithDebInfo and Debug. This is equivalent to qmake's --debug-and-release --force-debug-info This should give us minimal coverage for debug-and-release builds, as well as avoid regressions with NMC aka multiple configurations. If the qtbase builds successfully, we can try to extend the rest of the repositories to also build with NMC on Windows. We can't add such a configuration to macOS for now, because it requires CMake 3.18, which is not released yet. Disable PCH because it seems to fail the build when used together with Ninja Multi-Config. Task-number: QTBUG-80900 Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97 Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtbase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index e3811c86..3727c1b7 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -48,7 +48,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' -- cgit v1.2.3