From 785e2717712eefb9370fe63052ac9c2f7d955191 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 15 Feb 2022 15:12:58 +0100 Subject: [PATCH] coin: Use configure for iOS configurations 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 (cherry picked from commit 07f418d4153f07aa9c745577b7386a8ac95e010a) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 9 +++++---- coin/platform_configs/ios-tests.yaml | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a8a58c21..07b39df4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -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' diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index 7f009ac1..5fe30e18 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -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' + ]