CMake: Replace all Windows configurations with Ninja Multi-Config

All the qmake MSVC Windows configurations are debug_and_release ones, so the equivalent CMake configurations should be the same for all repositories. Task-number: QTBUG-80900 Task-number: QTBUG-84883 Change-Id: I083d7a355558666a5f66efdffb592f5e93705547 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-05-15 18:21:24 +02:00 · 2020-05-15 18:21:24 +02:00 · b4d6eed112
parent 849fe06871
commit b4d6eed112
19 changed files with 19 additions and 19 deletions
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@ -36,7 +36,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'
--- a/coin/platform_configs/qt5compat.yaml
+++ b/coin/platform_configs/qt5compat.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtandroidextras.yaml
+++ b/coin/platform_configs/qtandroidextras.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtcoap.yaml
+++ b/coin/platform_configs/qtcoap.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@ -20,7 +20,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'
--- a/coin/platform_configs/qtdoc.yaml
+++ b/coin/platform_configs/qtdoc.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtgraphicaleffects.yaml
+++ b/coin/platform_configs/qtgraphicaleffects.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtnetworkauth.yaml
+++ b/coin/platform_configs/qtnetworkauth.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtquickcontrols2.yaml
+++ b/coin/platform_configs/qtquickcontrols2.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtquicktimeline.yaml
+++ b/coin/platform_configs/qtquicktimeline.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qttools.yaml
+++ b/coin/platform_configs/qttools.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qttranslations.yaml
+++ b/coin/platform_configs/qttranslations.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtvirtualkeyboard.yaml
+++ b/coin/platform_configs/qtvirtualkeyboard.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@ -15,7 +15,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'
--- a/coin/platform_configs/qtwebsockets.yaml
+++ b/coin/platform_configs/qtwebsockets.yaml
@ -15,7 +15,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'