lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 12:37:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Add Windows10 x64 MinGW 8.1 host Android CMake targets

Browse Source 
Adds the missing Windows host Android target configurations.

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-86053
Task-number: QTBUG-85911
Change-Id: I421c6fc726a4813dbab5fcd67961ae4124eccb13
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alexandru Croitor
2020-08-05 13:41:42 +02:00
parent 89dc32b516
commit 195a8210c1
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms.yaml
View File

@@ -1,7 +1,8 @@
Version: 2 Version: 2
Include: [ Include: [
cmake_platforms_target_android_host_linux.yaml, cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml
] ]
Configurations: Configurations:
- -
@@ -58,6 +59,7 @@ Configurations:
Features: ['Packaging', 'Sccache'] Features: ['Packaging', 'Sccache']
Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
- -
Id: 'Windows10-Mingw8-x64-host'
Template: 'qtci-windows-10-x86_64-51' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'Mingw' Compiler: 'Mingw'
Features: ['Packaging', 'Sccache'] Features: ['Packaging', 'Sccache']

50
coin/platform_configs/cmake_platforms_target_android_host_windows.yaml Normal file
View File

@@ -0,0 +1,50 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10-Mingw8-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
'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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-windows-10-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10-Mingw8-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
'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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-windows-10-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10-Mingw8-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
'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}}',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-windows-10-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10-Mingw8-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
'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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']