From 6a356f7e181750e77969eaa08e9b1ca62eb59cb6 Mon Sep 17 00:00:00 2001 From: "Rebecca N. Palmer" Date: Sat, 29 Oct 2016 22:15:32 +0100 Subject: [PATCH] download_and_compile: use our previously compiled cmake if it exists --- download_and_compile.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index a8e5dbc..fc34f67 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -295,7 +295,11 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="CMAKE"' ]]; then _make cmake CMAKE="$INSTALL_DIR_CMAKE/bin/cmake" else - CMAKE=cmake + if [ -x "$INSTALL_DIR_CMAKE/bin/cmake" ]; then + CMAKE="$INSTALL_DIR_CMAKE/bin/cmake" + else + CMAKE=cmake + fi fi #######################################################