From a7a31600b4127a2dc80140c532c4a01ff556c79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 4 Jun 2018 11:24:52 +0300 Subject: Provisioning: Update cmake to 3.11.3 on macos It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8 the sysroot folder might have been unversioned (MacOSX10.12.sdk -> MacOSX.sdk). In that case older cmake can't detect correct SDK version. This is causing issues when building Pyside2. Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8 Reviewed-by: Simon Hausmann --- coin/provisioning/common/macos/cmake.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index f926de89..e22425b7 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -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/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" -SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" -appPrefix="cmake-3.6.2-Darwin-x86_64" +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" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.6.2" >> ~/versions.txt +echo "CMake = 3.11.3" >> ~/versions.txt -- cgit v1.2.3