lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Add macOS host Android target configs

Browse Source 
This partially reverts 37cb787dc1
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>
This commit is contained in:
Alexandru Croitor
2020-09-08 10:27:52 +02:00
parent 9ad520eba2
commit 89dc32b516
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coin/platform_configs/cmake_platforms.yaml
View File

@@ -1,5 +1,8 @@
Version: 2 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: Configurations:
- -
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'

46
coin/platform_configs/cmake_platforms_target_android_host_macos.yaml Normal file
View File

@@ -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=']