diff options
| author | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-11-21 11:12:13 +0100 |
|---|---|---|
| committer | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-11-23 09:14:04 +0100 |
| commit | 2034c7195328881f34583acda51a74fceea61618 (patch) | |
| tree | d81c9f2d2ddf6dede3a32e53bab46e666cad0f9a | |
| parent | 1c09ad4cf88d8c55ce26a168881747041b697397 (diff) | |
Update Protobuf to 21.9 version
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/install_protobuf.sh | 6 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/protobuf.ps1 | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index fd275cc4..889defa1 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -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 diff --git a/coin/provisioning/common/windows/protobuf.ps1 b/coin/provisioning/common/windows/protobuf.ps1 index da667d47..306d3397 100644 --- a/coin/provisioning/common/windows/protobuf.ps1 +++ b/coin/provisioning/common/windows/protobuf.ps1 @@ -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 |