From dbd18fc0c5a8a7c58390c7aff09865d601605bf9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 6 Mar 2020 14:07:10 +0100 Subject: [PATCH] Re-enable iOS CMake builds This reverts commit dad8e600bd5ad5a93ae160de570161bb3a029f56. Change-Id: I6aab4d5818e4cbd3ec83ad6d57fa0bdd2348bf35 Reviewed-by: Simon Hausmann --- coin/platform_configs/qtbase.yaml | 8 ++++++++ coin/platform_configs/qtsvg.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 5a36e2c9..b01fee99 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -53,3 +53,11 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + 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' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index dc6897dd..bfa3e741 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -28,3 +28,11 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + 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' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos']