From 3069c615b3eec42c3bce420cb9880e9ebab443a4 Mon Sep 17 00:00:00 2001 From: Martin West Date: Mon, 14 Dec 2015 23:23:09 +0100 Subject: [PATCH] added check to see if cmake can be found on the path, before setting it to the cmake in Applications. --- makefiles/Makefile.unix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makefiles/Makefile.unix b/makefiles/Makefile.unix index 6e67b7be11..1959bbdc2b 100644 --- a/makefiles/Makefile.unix +++ b/makefiles/Makefile.unix @@ -218,7 +218,12 @@ endif # LINUX ifeq ($(PLATFORM),MACOSX) CCC = clang++ -fPIC -std=c++11 -mmacosx-version-min=$(MAC_MIN_VERSION) -stdlib=libc++ DYNAMIC_LD = ld -arch x86_64 -bundle -flat_namespace -undefined suppress -macosx_version_min $(MAC_MIN_VERSION) -lSystem -compatibility_version 1.0 -current_version $(OR_TOOLS_VERSION) - CMAKE = /Applications/CMake.app/Contents/bin/cmake + ifeq (, $(shell which cmake)) + $(warning "no cmake in $(PATH), assuming it is in /Applications ") + CMAKE ?= /Applications/CMake.app/Contents/bin/cmake + endif + # CMAKE = /Applications/CMake.app/Contents/bin/cmake + JNI_LIB_EXT = jnilib ifeq ($(UNIX_MONO_DIR),) CSC = gmcs