From 803eb987adcf7448507b65effae9d59a490b53ae Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 23 Mar 2020 15:46:27 +0100 Subject: CMake: Enable iOS simulator_and_device builds Coin now has CMake 3.17, so iOS multi-arch builds should successfully build. Switch the iOS CMake configurations to simulator_and_device ones. Task-number: QTBUG-80899 Change-Id: I9c8bde9f1a3c483ea296f3d9d06f089cbfdf2416 Reviewed-by: Liang Qi --- coin/platform_configs/qtsvg.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtsvg.yaml') diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 26b05e8c..59ba478c 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -35,7 +35,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' -- cgit v1.2.3 From b4d6eed11203389c104a51f8041ca4e353071a06 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 15 May 2020 18:21:24 +0200 Subject: 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 Reviewed-by: Qt CI Bot --- coin/platform_configs/qtsvg.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtsvg.yaml') diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 59ba478c..3b2ae3fa 100644 --- 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' -- cgit v1.2.3 From 3b7da852e63c8b7f56f25a0937ce631237d6168e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 11 Jun 2020 18:24:10 +0200 Subject: CMake: Fix a lot of failing tests on MinGW 32bit due to debug symbols When building a RelWithDebInfo configuration, the debug symbols for the libraries are embedded into the .dlls. This causes the file size to be really big (around 400MB for libQt6Gui.dll). On a 32-bit system, the Windows loader failed to map such big libraries into memory, and thus certain tests failed with exit code 0xc0000017 which means STATUS_NO_MEMORY. The solution is to enable the separate debug info feature, to split the debug files into separate files, just making they dlls nice and small. This should fix quite a few of the failing MinGW 32-bit tests for qtdeclarative, qtquickcontrols2, etc. Task-number: QTBUG-84886 Change-Id: I10ae0acca5d7d5523d3ae2f0c49587ace239f301 Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot --- coin/platform_configs/qtsvg.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtsvg.yaml') diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 3b2ae3fa..cf9d61c8 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -39,5 +39,5 @@ Configurations: - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3