From 2a283fe9902f52634f07bd0680a799f317c1df5d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 27 Jun 2022 13:19:28 +0200 Subject: coin: Use configure for newly added mac configuration Use the configure script to configure Qt in the CI, instead of calling CMake directly. Amends 21ed2db77b95cf0c7774a26da4d6b73cd08d3568 Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: Ibd4ae9bb7dfdbff0cc1ae7803a6aaf5e0c504d2e Reviewed-by: Toni Saario (cherry picked from commit 032dfe48faebe0434ce12a5f6a90c2bdffa33666) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 3cc87e75..3d4c2f9e 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -25,8 +25,11 @@ Configurations: Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON' + Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' + Environment variables: [ + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' + ] # Test on all supported macOS versions (deployment targets) -- cgit v1.2.1