diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-25 16:40:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-25 16:40:50 +0100 |
| commit | bc1694419108d709357fd43add106e67fd2ae982 (patch) | |
| tree | 66f1147f64ff95d943b3125fcc509a275af55645 /coin/provisioning/common | |
| parent | 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f (diff) | |
| parent | 63bda0c988cad19d3a1d6906fdf3e75af1ee84b0 (diff) | |
Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
.gitmodules
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh
Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/cmake.ps1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 1716467c..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -40,6 +40,9 @@ $zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" +echo "Removing old cmake" +Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue + Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" |