always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #129 from mjfwest/master

Browse Source 
#127 added check to see if cmake can be found on the path, before setting …
This commit is contained in:
lperron
2015-12-15 10:39:36 +01:00
parent 96357a3647 3069c615b3
commit 4d5420406a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
makefiles/Makefile.unix
View File

@@ -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