diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-22 20:10:43 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-29 10:00:50 +0000 |
| commit | 95c7b90309de24badd51aa8017e8145c7f2e655e (patch) | |
| tree | be9e1edd08ec261a5fc01ff92fed0f4a3f0b66ac | |
| parent | 63c515a6cbb002e96eea0134a77c380e5ef7b7c9 (diff) | |
Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 8 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/cmake.sh | 12 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 38c515a6..f03bd16c 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.15.0-rc1 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.15" -version="3.15.5" +majorminorversion="3.16" +version="3.16.0-rc4" 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="867f44e232346b79167b64cb5380bc0955e953fb" +SHA1="def260a8f27d3b1b9c3d042ec936236598bea52a" 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 cb0a24d7..8e20586b 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,15 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" -SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" -appPrefix="cmake-3.15.5-Darwin-x86_64" +majorminorversion="3.16" +version="3.16.0-rc4" +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="a2727f4f01329b5b8154840e9ba0de37e3fb14d5" +appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.15.5" >> ~/versions.txt +echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 256d2439..bbec4b4f 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.15" -$version = "3.15.5" +$majorminorversion = "3.16" +$version = "3.16.0-rc4" $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 "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" +Verify-Checksum $zip "989e5c6384870a77425f2ddbbf305bd3f6dad426" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" |