mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Set OPENSSL_ROOT_DIR for gRPC unix provisioning script
Change-Id: I44fb0f94f183ddc10399c331e8e1a38c533dcf0d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 5a1ed71917)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
committed by
Heikki Halmet
parent
e2935f2068
commit
aa520141a0
@@ -67,7 +67,7 @@ installPrefix="$HOME/install-grpc-$version"
|
||||
targetDir="$HOME/grpc-$version"
|
||||
targetFile="$targetDir.zip"
|
||||
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
|
||||
unzip "$targetFile" -d "$HOME"
|
||||
unzip -q "$targetFile" -d "$HOME"
|
||||
sudo rm "$targetFile"
|
||||
|
||||
# devtoolset is needed when running configuration
|
||||
@@ -77,10 +77,17 @@ fi
|
||||
|
||||
if uname -a |grep -q Darwin; then
|
||||
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
|
||||
SetEnvVar PATH "\$PATH:$installPrefix/bin"
|
||||
fi
|
||||
|
||||
# MacOS
|
||||
if [[ -n "$OPENSSL_DIR" ]]; then
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
|
||||
# Linux
|
||||
elif [[ -n "$OPENSSL_HOME" ]]; then
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME
|
||||
fi
|
||||
|
||||
echo "Configuring and building gRPC"
|
||||
|
||||
buildDir="$HOME/build-grpc-$version"
|
||||
|
||||
Reference in New Issue
Block a user