diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:20:42 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:22:36 +0200 |
commit | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (patch) | |
tree | bfd83a337c4bca328030fd64999129a559791be0 /coin/provisioning/common/windows/cmake.ps1 | |
parent | 318d651b446a5f0f56798c4074c2c20f6d9e1944 (diff) | |
parent | a10584e57c1be4149b3a067de86fa61c44b8a757 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Bringing in new SHA1s, while keeping wip/cmake's own configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
Change-Id: I40e26301cf10c3c7bd8b0b4dc11cc47eedc1700e
Diffstat (limited to 'coin/provisioning/common/windows/cmake.ps1')
-rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 4246fa02..5d61549a 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.17" -$version = "3.17.0-rc2" +$version = "3.17.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 "db10f03227b978a51c76453283f3280fc63c157d" +Verify-Checksum $zip "d4a1d60fccaee7f9a8ceb1ed4fb576a63103a69f" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" |