diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
| commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
| tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/common/linux/cmake_linux.sh | |
| parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
| parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/common/linux/cmake_linux.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..a3b2a9cc 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -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" |