diff options
author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/common/windows/cmake.ps1 | |
parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/common/windows/cmake.ps1')
-rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..9d3d6aef 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.7" +$version = "3.7.2" $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 "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" |