diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:20:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:22:36 +0200 |
| commit | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (patch) | |
| tree | bfd83a337c4bca328030fd64999129a559791be0 /coin/provisioning/common/linux/cmake_linux.sh | |
| parent | 318d651b446a5f0f56798c4074c2c20f6d9e1944 (diff) | |
| parent | a10584e57c1be4149b3a067de86fa61c44b8a757 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Bringing in new SHA1s, while keeping wip/cmake's own configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
Change-Id: I40e26301cf10c3c7bd8b0b4dc11cc47eedc1700e
Diffstat (limited to 'coin/provisioning/common/linux/cmake_linux.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index e2bb13aa..ea2cdf8e 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.17" -version="3.17.0-rc2" +version="3.17.2" 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="5b64ed00a48db524e981b82e3a3a8a14d52091c2" +SHA1="24a68e61292b91c706b09b4aa8044764e2dfb2e2" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" |