summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-28 13:07:43 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-02-07 19:25:07 +0000
commit25160f24b6dea4172b482610ca500f961360c787 (patch)
tree71e8f8fd7b0a87641e8a442eb9332b177f6cc230
parent2835a4d873c19f9171ebd8c8a46a7bf910486544 (diff)
Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 77eeee64a43c5c448321b8f5ac7b64c872e14489)
-rw-r--r--coin/provisioning/common/cmake.ps110
-rw-r--r--coin/provisioning/qtci-windows-10-x86/cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/cmake.ps11
3 files changed, 12 insertions, 0 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
new file mode 100644
index 00000000..6870f3a7
--- /dev/null
+++ b/coin/provisioning/common/cmake.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
+
+Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
+Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
+
+Extract-Zip $zip C:
+Remove-Item C:\CMake -Force -Recurse
+Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake
diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
new file mode 100644
index 00000000..8dbe0372
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
new file mode 100644
index 00000000..8dbe0372
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\cmake.ps1"