summaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-05-04 17:09:56 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-05-25 13:41:38 +0200
commit5cd8e9576d453a6d70d110fc0cdc1b9d29dd0365 (patch)
treed73adab914ed4978f58b348e1b87b6c8b7d26aaf /coin/platform_configs
parent598f82300abb3ffd6164f7213265808c4779b7cc (diff)
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/qtbase.yaml2
1 files changed, 1 insertions, 1 deletions
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'