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

Update CMake to version 3.15.5

Browse Source 
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Leander Beernaert
2019-10-17 11:28:24 +02:00
committed by Simon Hausmann
parent c85543f88d
commit 8eab11f696
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.15"
version="3.15.0-rc1"
version="3.15.5"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a"
SHA1="867f44e232346b79167b64cb5380bc0955e953fb"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"

10
coin/provisioning/common/macos/cmake.sh
View File

@@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz"
SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652"
appPrefix="cmake-3.15.0-rc1-Darwin-x86_64"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz"
SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64"
appPrefix="cmake-3.15.5-Darwin-x86_64"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
echo "CMake = 3.15.0-rc1" >> ~/versions.txt
echo "CMake = 3.15.5" >> ~/versions.txt

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

@@ -34,7 +34,7 @@
. "$PSScriptRoot\helpers.ps1"
$majorminorversion = "3.15"
$version = "3.15.0-rc1"
$version = "3.15.5"
$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 "3739F2FF0CAD6EC15475A32D419EBEB0864C4800"
Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf"
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"