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/qtquickcontrols2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtquickcontrols2.yaml') diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml index 26b05e8c..59ba478c 100644 --- a/coin/platform_configs/qtquickcontrols2.yaml +++ b/coin/platform_configs/qtquickcontrols2.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