aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-06 14:51:00 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-09 23:42:21 +0100
commite9c2be7b6a13d6a0c44f2073f3fd889d06b270f2 (patch)
treeb9662ceb4322aaa64470716799bc0e9dd748b943 /coin/provisioning
parent6ff1dcfbd3b1c292698349b2dbfb6ef437a31629 (diff)
Update provisioned CMake version to 3.17.0-rc2
We want to test debug_and_release builds with CMake as soon as possible. Change-Id: I7d4c0a4e33adc26129844ff34ea8df6b149e184f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-xcoin/provisioning/common/linux/cmake_linux.sh6
-rwxr-xr-xcoin/provisioning/common/macos/cmake.sh6
-rw-r--r--coin/provisioning/common/windows/cmake.ps16
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 f03bd16c..e2bb13aa 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.16"
-version="3.16.0-rc4"
+majorminorversion="3.17"
+version="3.17.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="def260a8f27d3b1b9c3d042ec936236598bea52a"
+SHA1="5b64ed00a48db524e981b82e3a3a8a14d52091c2"
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 8e20586b..49943e7d 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.16"
-version="3.16.0-rc4"
+majorminorversion="3.17"
+version="3.17.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="a2727f4f01329b5b8154840e9ba0de37e3fb14d5"
+SHA1="af50a64bcfbb8dfefae355624b254e3c547dcd3d"
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 bbec4b4f..4246fa02 100644
--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -33,8 +33,8 @@
. "$PSScriptRoot\helpers.ps1"
-$majorminorversion = "3.16"
-$version = "3.16.0-rc4"
+$majorminorversion = "3.17"
+$version = "3.17.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 "989e5c6384870a77425f2ddbbf305bd3f6dad426"
+Verify-Checksum $zip "db10f03227b978a51c76453283f3280fc63c157d"
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"