lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Update Cmake to version 3.7.2

Browse Source 
QtCreator requires Cmake minimal version to be at least 3.7.0

Task-number: QTQAINFRA-3272
Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Heikki Halmet
2019-10-11 12:21:58 +03:00
parent d02f0a913e
commit 3f9673d109
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/provisioning/common/linux/cmake_linux.sh
View File

@@ -33,7 +33,7 @@
##
#############################################################################
# This script installs CMake 3.6.2
# This script installs CMake 3.7.2
# CMake is needed for autotests that verify that Qt can be built with CMake
@@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
version="3.7.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
SHA1="915bc981aab354821fb9fd28374a720fdb3aa180"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"

6
coin/provisioning/common/windows/cmake.ps1
View File

@@ -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"