diff options
author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/common/cmake.ps1 | |
parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/provisioning/common/cmake.ps1')
-rw-r--r-- | coin/provisioning/common/cmake.ps1 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 8a94dc5d..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -40,16 +40,13 @@ $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" Extract-Zip $zip C: -# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS -if((Test-Path -Path "C:\CMake" )){ - try { - Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old - } catch {} -} $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake |