From 02cc128cdc31fd4ac5334e2b58fe0f1535ae8730 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 20 Apr 2021 11:51:24 +0300 Subject: Enable macOS target on ARM HW on all modules Change-Id: I3528a2bca79f20345926e61f3eef715fc63d84e8 Reviewed-by: Alexandru Croitor --- coin/platform_configs/macos.yaml | 8 ++++++++ coin/platform_configs/qtbase.yaml | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 4fd29f55..c99c440e 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -45,3 +45,11 @@ Configurations: 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' ] + + # ARM64 target built on apple silicon + - + Id: 'macos-latest-xcode-arm64-developer-build' + Template: 'qtci-macos-11.0-arm64' + Compiler: 'Clang' + Features: ['InsignificantTests'] + Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 1b434924..35603677 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -15,14 +15,6 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - -# ARM64 target built on apple silicon -- - Id: 'macos-latest-xcode-arm64-build' - Template: 'qtci-macos-11.0-arm64' - Compiler: 'Clang' - Features: ['InsignificantTests'] - Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' - Template: 'qtci-linux-RHEL-8.2-x86_64-50' Target os: 'Android_ANY' -- cgit v1.2.3