From 66ead0a68514b46f19a7efe00f52a35aa18a029f Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 21 Jan 2021 13:27:39 +0200 Subject: Update macOS android targets platform dependency Change-Id: I4dcedfe812178d2ce01f3fa35c5f0e24e01c60f8 Reviewed-by: Toni Saario --- .../cmake_platforms_target_android_host_macos.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml index 1b842b35..c30b0381 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -6,7 +6,7 @@ Configurations: Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-10.14-host' + Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', @@ -17,7 +17,7 @@ Configurations: Target arch: 'armv7' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-10.14-host' + Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', @@ -28,7 +28,7 @@ Configurations: Target arch: 'x86' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-10.14-host' + Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', @@ -39,7 +39,7 @@ Configurations: Target arch: 'x86_64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-10.14-host' + Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', -- cgit v1.2.3