From 1fbab49ebc6280a745a20dc915198b304a4e2304 Mon Sep 17 00:00:00 2001 From: Martin West Date: Thu, 31 Dec 2015 02:14:03 +0000 Subject: [PATCH] Corrected bug finding camke on OSX with home-brew or 'official' distribution. --- makefiles/Makefile.unix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/makefiles/Makefile.unix b/makefiles/Makefile.unix index 1959bbdc2b9..8ae245eccc3 100644 --- a/makefiles/Makefile.unix +++ b/makefiles/Makefile.unix @@ -218,9 +218,13 @@ 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) - ifeq (, $(shell which cmake)) + + CMAKE := $(shell which cmake) + ifeq ($(CMAKE),) $(warning "no cmake in $(PATH), assuming it is in /Applications ") CMAKE ?= /Applications/CMake.app/Contents/bin/cmake + else + $(warning "cmake found: $(CMAKE)") endif # CMAKE = /Applications/CMake.app/Contents/bin/cmake