diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 7b15ba80..3a7020cc 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -55,7 +55,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 893b9cd7..5b97a4a7 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -17,7 +17,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - @@ -29,7 +28,6 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', ] @@ -122,7 +120,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - Id: 'macos-14-arm64-developer-build' @@ -132,7 +129,6 @@ Configurations: Configure arguments: '-developer-build -nomake examples -debug -framework' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', ] diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index b8cfc5f9..7743c714 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -53,6 +53,5 @@ Configurations: Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON', ] diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 110d8b9c..bf3a6d90 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \ ninja all:all sudo env "PATH=$PATH" ninja install:all +SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" + # Refresh shared library cache if OS isn't macOS if uname -a |grep -qv "Darwin"; then sudo ldconfig