diff options
| -rwxr-xr-x | coin/provisioning/common/unix/install_cmake.sh | 12 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh) | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh index 1e33c007..e76d2c6d 100755 --- a/coin/provisioning/common/unix/install_cmake.sh +++ b/coin/provisioning/common/unix/install_cmake.sh @@ -57,14 +57,16 @@ sudo rm "$targetFile" echo "Configuring and building cmake" cd "$targetDir" -if uname -a |grep -qv Darwin; then +if uname -a |grep -q Darwin; then + ./bootstrap --prefix="$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else ./bootstrap --prefix="$cmakeHome" - make - make install + SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" fi +make +sudo make install sudo rm -r "$targetDir" -SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" - echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index 4f4d405e..a87667fe 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/cmake.sh" +"$BASEDIR/../common/unix/install_cmake.sh" |