From 032a0e18bf1e8e97cd7e7000bb97156203db8332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 24 Oct 2022 17:04:07 +0200 Subject: [PATCH] Specify where to find protobuf on macos Otherwise it doesn't find it and the build is configured without it. Change-Id: Ib6b151c1177b4bde0de268f0a948a9a31f3a7225 Reviewed-by: Alexey Edelev Reviewed-by: Ievgenii Meshcheriakov --- coin/platform_configs/macos.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 77a35baf..22679a7f 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -17,6 +17,7 @@ Configurations: Environment variables: [ '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 -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] @@ -28,7 +29,8 @@ Configurations: 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"' + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', + 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] # Test on all supported macOS versions (deployment targets) @@ -90,7 +92,8 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - Id: 'macos-latest-xcode-arm64-developer-build' @@ -98,6 +101,9 @@ Configurations: Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' + Environment variables: [ + 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' + ] # Note: We do not include OpenSSL or PostgreSQL in this build, # as the M1 CI machines are not provisioned for that yet.