diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-15 15:12:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-08 23:27:27 +0200 |
| commit | e0c0aaade49d1554764c2af66658bba8388c087a (patch) | |
| tree | 7a3641551b5ac45b38a68ced92203142a66dc33b /coin | |
| parent | 6d6eccab3454483540f4948085a231fc7403e079 (diff) | |
coin: Use configure for macOS desktop configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.
Pick-to: 6.2 6.3 6.4
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I38e038e6682f77a5ea3f2335f24f8bcbd2e7c605
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/macos.yaml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 17a22e3e..3cc87e75 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -12,10 +12,11 @@ Configurations: Template: 'qtci-macos-12-x86_64-102' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', '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 -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF', 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] @@ -88,14 +89,17 @@ Configurations: Id: 'macos-latest-xcode-x86_64-developer-build' Template: 'qtci-macos-12-x86_64-102' Compiler: 'Clang' - Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' + Environment variables: [ + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + ] - Id: 'macos-latest-xcode-arm64-developer-build' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' - Features: ['DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON' + Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' # Note: We do not include OpenSSL or PostgreSQL in this build, # as the M1 CI machines are not provisioned for that yet. |