diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-04 16:16:27 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-12 18:21:53 +0100 |
| commit | dc8414012762ae8cd0850579e429615d522e2967 (patch) | |
| tree | 34191a83136061b5d6ba0cfe15cd4a3d4492f3fa /coin/provisioning | |
| parent | 4b97dafe86496b4b9558768a5b97b7e0216ab449 (diff) | |
CMake: Update provisioned CMake to version 3.19.0-rc2
We want to be able to build qdoc and lupdate on MSVC with
Ninja Multi-Config.
Task-number: QTBUG-85411
Task-number: QTBUG-88139
Task-number: QTBUG-87315
Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
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 7f01c8f5..98c71896 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.18" -version="3.18.3" +majorminorversion="3.19" +version="3.19.0-rc2" 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="6e5bb13e07616e8fa28ec22e8e8dd2396510f10c" +SHA1="4e6642baae37c1dd5129595d9392685878ef3f6f" 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 13eb82b7..60f17745 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.18" -version="3.18.3" +majorminorversion="3.19" +version="3.19.0-rc2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz" -SHA1="75a9bd7ec1ec7cbb7b7fb4ecbe4ec26b691c67c9" +SHA1="e9587b73e3a47a13795959965b3f06568e1f0591" appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 7dbad0da..fc0a2e53 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.18" -$version = "3.18.3" +$majorminorversion = "3.19" +$version = "3.19.0-rc2" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "ab82b5dd945a7f54d4ecb435441bae247c646c26" +Verify-Checksum $zip "e66e29530adcebfce321855d21a125d324c784d6" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" |