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

support scip 3.1.0 on unix

Browse Source
This commit is contained in:
lperron@google.com
2014-03-01 15:09:16 +00:00
parent 9f466c4bef
commit 55fdea60b0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
makefiles/Makefile.third_party.unix
View File

@@ -30,8 +30,8 @@ LIBTOOL_TAG = 2.4.2
#
# The GLPK archive should be glpk-4.53.tar.gz
GLPK_TAG = 4.53
# The SCIP archive should be scipoptsuite-3.0.2.tgz
SCIP_TAG = 3.0.2
# The SCIP archive should be scipoptsuite-3.1.0.tgz
SCIP_TAG = 3.1.0
# Detect if SCIP archive is there.
ifeq ($(wildcard dependencies/archives/scipoptsuite-$(SCIP_TAG).tgz),)
@@ -41,10 +41,10 @@ else
SCIP_TARGET = dependencies/install/scipoptsuite-$(SCIP_TAG)/scip-$(SCIP_TAG)/bin/scip
SCIP_MAKEFILE = UNIX_SCIP_DIR = $(OR_ROOT_FULL)/dependencies/install/scipoptsuite-$(SCIP_TAG)/scip-$(SCIP_TAG)
ifeq ($(PLATFORM), LINUX)
BUILD_SCIP = make ZIMPL=false READLINE=false USRCXXFLAGS=-fPIC CFLAGS=-fPIC
BUILD_SCIP = make ZIMPL=false READLINE=false USRCXXFLAGS=-fPIC CFLAGS=-fPIC GMP=false
endif
ifeq ($(PLATFORM), MACOSX)
BUILD_SCIP = make ZIMPL=false READLINE=false ARCH=x86_64
BUILD_SCIP = make ZIMPL=false READLINE=false ARCH=x86_64 GMP=false
endif
endif

3
makefiles/Makefile.unix
View File

@@ -86,6 +86,9 @@ endif
ifeq ($(UNIX_SCIP_TAG),3.0.1)
SCIP_30 = TRUE
endif
ifeq ($(UNIX_SCIP_TAG),3.1.0)
SCIP_30 = TRUE
endif
SWIG_INC = $(GLPK_SWIG) $(CLP_SWIG) $(CBC_SWIG) $(SCIP_SWIG) $(SLM_SWIG) $(GUROBI_SWIG)