aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-11-16 23:17:21 +0100
committerHeikki Halmet <heikki.halmet@qt.io>2021-11-18 12:05:41 +0200
commited9970c92dbffca65252fc0cfb5fd01ba278fd36 (patch)
treed61c1c82a27be9171ebad625bc2b873dc561974b
parent0b5b8030a1348a81fd894bf38d2257e00abfdbcf (diff)
coin: Disable PostgreSQL on macOS 12 builds
The provisioning doesn't support it yet. Change-Id: Icf0cea1b58813a1e0037c00c726f4cc9096d0ac8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 9358ab26ed19b14af65d6c232f18ecdeb86d3443) Reviewed-by: Toni Saario <toni.saario@qt.io>
-rw-r--r--coin/platform_configs/macos.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index c47a44c1..4b4f0947 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -21,7 +21,7 @@ Configurations:
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}}'
+ 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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_gds=OFF',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'