lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-04 04:36:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Protobuf to 21.9 version

Browse Source 
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Konrad Kujawa
2022-11-21 11:12:13 +01:00
parent 1c09ad4cf8
commit 2034c71953
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/unix/install_protobuf.sh
View File

@@ -57,8 +57,8 @@ fi
# This script will install Google's Protocal Buffers
version="3.6.1"
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
version="21.9"
sha1="3226a0e49d048759b702ae524da79387c59f05cc"
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
@@ -84,7 +84,7 @@ fi
buildDir="$HOME/build-protobuf-$version"
mkdir "$buildDir"
cd "$buildDir"
cmake $targetDir/cmake -G"Ninja Multi-Config" -DCMAKE_INSTALL_PREFIX=$installPrefix $extraCMakeArgs -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -Dprotobuf_BUILD_PROTOC_BINARIES=ON -DBUILD_SHARED_LIBS=OFF -Dprotobuf_WITH_ZLIB=OFF -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_CONFIGS=all
cmake $targetDir -G"Ninja Multi-Config" -DCMAKE_INSTALL_PREFIX=$installPrefix $extraCMakeArgs -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -Dprotobuf_BUILD_PROTOC_BINARIES=ON -DBUILD_SHARED_LIBS=OFF -Dprotobuf_WITH_ZLIB=OFF -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_CONFIGS=all
ninja all:all
sudo env "PATH=$PATH" ninja install:all

6
coin/provisioning/common/windows/protobuf.ps1
View File

@@ -60,8 +60,8 @@ function Find-Tool {
Find-Tool -Name "cmake.exe" -Path "C:\CMake\bin"
Find-Tool -Name "ninja.exe" -Path "C:\Utils\Ninja"
$version = "3.20.1"
$sha1 = "d89de6b747a264c0ddca3294b5095b785f1bd4f0"
$version = "21.9"
$sha1 = "3226a0e49d048759b702ae524da79387c59f05cc"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/protobuf/protobuf-all-$version.zip"
$externalUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
@@ -75,7 +75,7 @@ Remove $targetFile
# cd into the cmake directory where the CMakeLists.txt file is located
# then we build in a build\ subfolder there for simplicity's sake
Push-Location $targetDir\cmake
Push-Location $targetDir
### MinGW