Skip to content

Commit

Permalink
Corrected bug finding camke on OSX with home-brew or 'official' distr…
Browse files Browse the repository at this point in the history
…ibution.
  • Loading branch information
mjfwest committed Dec 31, 2015
1 parent 9c994c4 commit 1fbab49
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion makefiles/Makefile.unix
Expand Up @@ -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

Expand Down

0 comments on commit 1fbab49

Please sign in to comment.