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

coin: Use configure for iOS configurations

Browse Source 
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: If84d580bdcf166f07ecd1f6fb20e3404e1fb0e1c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 07f418d415)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor
2022-02-15 15:12:58 +01:00
committed by Qt Cherry-pick Bot
parent 69e123b11c
commit 785e271771
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coin/platform_configs/cmake_platforms.yaml
View File

@@ -129,11 +129,12 @@ Configurations:
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=',
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang']
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
]
-
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'

6
coin/platform_configs/ios-tests.yaml
View File

@@ -8,5 +8,7 @@ Configurations:
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=debug-and-release -nomake examples -platform macx-ios-clang'
]