summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/macos/cmake.sh
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-12-12 16:15:53 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-12-13 14:58:08 +0100
commit68c8693e5b451106478c0bc54aa5125f6cc2b02d (patch)
tree490d1358ec74478e4f951056f8a67f88aaf3f8fe /coin/provisioning/common/macos/cmake.sh
parent2d6f569ee9d66ff49ab803ad9c48a954e637e1da (diff)
parent3aef26846488f98110cb322ac6e9dda43649e993 (diff)
Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake builds in the CI. The platform configuration changes will be applied incremental as we merge support in the individual modules. Conflicts: coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Added ninja to coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh just to force re-provisioning. Removed module_config.yaml because that breaks license check in qmake builds. Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
Diffstat (limited to 'coin/provisioning/common/macos/cmake.sh')
-rwxr-xr-xcoin/provisioning/common/macos/cmake.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh
index e22425b7..8e20586b 100755
--- a/coin/provisioning/common/macos/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -42,13 +42,15 @@ 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.11.3-Darwin-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz"
-SHA1="3d13de8020ce560159fa5cecb669498c48552d96"
-appPrefix="cmake-3.11.3-Darwin-x86_64"
+majorminorversion="3.16"
+version="3.16.0-rc4"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz"
+SHA1="a2727f4f01329b5b8154840e9ba0de37e3fb14d5"
+appPrefix="cmake-$version-Darwin-x86_64"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
-echo "CMake = 3.11.3" >> ~/versions.txt
+echo "CMake = $version" >> ~/versions.txt