diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-15 07:51:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-14 09:58:51 +0000 |
| commit | 92b188ef622e196c33656aa7a7f0575a334823d5 (patch) | |
| tree | a793b3996ede355b3b6f441b396ed731038f01ad /coin/provisioning | |
| parent | 3344530eaabdfeda4129f1d63ec4ea97ade0d94c (diff) | |
CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 9218d50a6e207bc976569573d3449c319dcbd333)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 6 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/cmake.sh | 6 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 5ec0c768..922ed1e6 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.20" -version="3.20.5" +majorminorversion="3.21" +version="3.21.1" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz" -SHA1="55dcec47c2496d4e88cffc900c3990f9f3b14c03" +SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index 14db0ca6..b54ce326 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.20" -version="3.20.5" +majorminorversion="3.21" +version="3.21.1" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz" -SHA1="5632fed86dbe0e5157fd233b1db6db738dbe4d1f" +SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a" appPrefix="cmake-$version-macos-universal" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index d52aa0b0..6acd6a68 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.20" -$version = "3.20.5" +$majorminorversion = "3.21" +$version = "3.21.1" $zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove "C:\CMake" Download $officialurl $cachedurl $zip -Verify-Checksum $zip "1d93f648fba4d66d76ca3d0d7056ba8c411652d2" +Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386" |