diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-06-07 18:16:15 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-09-28 14:03:45 +0200 |
| commit | 5137b415a173b6cbd57751099a6d40c826e51b69 (patch) | |
| tree | 5243932564c89aae516e0f4bc8b8a5c412b9338d | |
| parent | 7f0841f7fc2ff0dc9f10f48f57b8f79d9443e6af (diff) | |
coin: Add explicit OpenSSL location during configure for macOS
This basically reverts 15e37e994d89aae1a8e35d59af7c9f1fe2d099ef, as we
now have support for multiple TLS backends.
Task-number: QTBUG-93205
Change-Id: I7466121c21c459bb7aee70f9f7c224cc079d16a5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | coin/platform_configs/macos.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index abe47ffd..7a32d988 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] - 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' + 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -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', @@ -48,7 +48,7 @@ Configurations: Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests'] - Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' @@ -56,12 +56,13 @@ Configurations: # Build arm64 developer-builds for all modules, and run their tests. This ensures that we have full # arm64 build and test coverage, regardless of possible issues with the universal build. + # Note: We do not include OpenSSL or PostgreSQL in this build, as the M1 CI machines are not provisioned for that yet. - Id: 'macos-latest-xcode-arm64-developer-build' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['DoNotRunTests'] - Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' + Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON' - Id: 'macos-11-arm64-developer-build-tests' Template: 'qtci-macos-11.0-arm64' |