diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-08 10:27:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-17 12:48:29 +0200 |
| commit | 89dc32b51635fee9794f3d8dbec62fb4c3ff889b (patch) | |
| tree | d1ed30823446cc43f0636ffabe48e0c9ede3f4fb | |
| parent | 9ad520eba22a07e844f9cd794cffc41167cef6d4 (diff) | |
CMake: Add macOS host Android target configs
This partially reverts 37cb787dc10e8ce666e610ef7112714938f78827
because it reintroduces the macOS host Android configs which were
removed due to qtbase std::pair shenanigans.
Each android architecture we support is re-added as a separate
configuration, because CMake builds currently don't support multi-abi
builds as tracked in QTBUG-80943.
Task-number: QTBUG-84924
Task-number: QTBUG-86053
Change-Id: Iac48ab41a1eb9cf1e4219f62683355d1bb9a9891
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 5 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android_host_macos.yaml | 46 |
2 files changed, 50 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b1dedf2e..1eaa76a9 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -1,5 +1,8 @@ Version: 2 -Include: [cmake_platforms_target_android_host_linux.yaml] +Include: [ + cmake_platforms_target_android_host_linux.yaml, + cmake_platforms_target_android_host_macos.yaml + ] Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml new file mode 100644 index 00000000..b87a9800 --- /dev/null +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -0,0 +1,46 @@ +Version: 2 +Configurations: +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-10.14-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + 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=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-10.14-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + 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=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-10.14-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + 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', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-10.14-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + 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_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] |