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

make: Fix DEPENDENCIES macros

Browse Source 
this will replace #2095
This commit is contained in:
Mizux Seiha
2020-07-06 17:25:30 +02:00
parent 7003d8cbd7
commit 52066bcded
5 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/Makefile.cpp.mk
View File

@@ -696,6 +696,7 @@ detect_cc:
@echo CFLAGS = $(CFLAGS)
@echo LDFLAGS = $(LDFLAGS)
@echo LINK_CMD = $(LINK_CMD)
@echo DEPENDENCIES_INC = $(DEPENDENCIES_INC)
@echo DEPENDENCIES_LNK = $(DEPENDENCIES_LNK)
@echo SRC_DIR = $(SRC_DIR)
@echo GEN_DIR = $(GEN_DIR)

17
makefiles/Makefile.third_party.unix.mk
View File

@@ -207,6 +207,9 @@ STATIC_GFLAGS_LNK = $(UNIX_GFLAGS_DIR)/lib/libgflags.a
DYNAMIC_GFLAGS_LNK = -L$(UNIX_GFLAGS_DIR)/lib -lgflags
GFLAGS_LNK = $(DYNAMIC_GFLAGS_LNK)
DEPENDENCIES_INC += $(GFLAGS_INC)
SWIG_INC += $(GFLAGS_SWIG)
DEPENDENCIES_LNK += $(GFLAGS_LNK)
OR_TOOLS_LNK += $(GFLAGS_LNK)
@@ -239,6 +242,9 @@ STATIC_GLOG_LNK = $(UNIX_GLOG_DIR)/lib/libglog.a
DYNAMIC_GLOG_LNK = -L$(UNIX_GLOG_DIR)/lib -lglog
GLOG_LNK = $(DYNAMIC_GLOG_LNK)
DEPENDENCIES_INC += $(GLOG_INC)
SWIG_INC += $(GLOG_SWIG)
DEPENDENCIES_LNK += $(GLOG_LNK)
OR_TOOLS_LNK += $(GLOG_LNK)
@@ -286,6 +292,9 @@ _PROTOBUF_LIB_DIR = $(dir $(wildcard \
DYNAMIC_PROTOBUF_LNK = -L$(_PROTOBUF_LIB_DIR) -lprotobuf
PROTOBUF_LNK = $(DYNAMIC_PROTOBUF_LNK)
DEPENDENCIES_INC += $(PROTOBUF_INC)
SWIG_INC += $(PROTOBUF_SWIG)
DEPENDENCIES_LNK += $(PROTOBUF_LNK)
OR_TOOLS_LNK += $(PROTOBUF_LNK)
@@ -432,6 +441,9 @@ DYNAMIC_ABSL_LNK = -L$(_ABSL_LIB_DIR) \
-labsl_time_zone
ABSL_LNK = $(STATIC_ABSL_LNK)
DEPENDENCIES_INC += $(ABSL_INC)
SWIG_INC += $(ABSL_SWIG)
DEPENDENCIES_LNK += $(ABSL_LNK)
############################################
@@ -759,6 +771,8 @@ COIN_LNK = \
$(OSI_LNK) \
$(COINUTILS_LNK)
DEPENDENCIES_INC += $(COIN_INC)
SWIG_INC += $(COIN_SWIG)
DEPENDENCIES_LNK += $(COIN_LNK)
OR_TOOLS_LNK += $(COIN_LNK)
@@ -818,6 +832,9 @@ $(_SCIP_LIB_DIR)libnlpi.cppad.a \
$(_SCIP_LIB_DIR)liblpinone.a \
$(_SCIP_LIB_DIR)libtpitny-7.0.1.darwin.x86_64.gnu.opt.a
endif
DEPENDENCIES_INC += $(SCIP_INC)
SWIG_INC += $(SCIP_SWIG)
DEPENDENCIES_LNK += $(SCIP_LNK)
############

20
makefiles/Makefile.third_party.win.mk
View File

@@ -235,6 +235,9 @@ ZLIB_INC = /I"$(WINDOWS_ZLIB_PATH)\\include"
ZLIB_SWIG = -I"$(WINDOWS_ZLIB_DIR)/include"
ZLIB_LNK = "$(WINDOWS_ZLIB_PATH)\lib\$(WINDOWS_ZLIB_NAME)"
DEPENDENCIES_INC += $(ZLIB_INC)
SWIG_INC += $(ZLIB_SWIG)
DEPENDENCIES_LNK += $(ZLIB_LNK)
##############
@@ -268,6 +271,9 @@ DYNAMIC_GFLAGS_LNK = "$(WINDOWS_GFLAGS_PATH)\lib\gflags_static.lib"
STATIC_GFLAGS_LNK = "$(WINDOWS_GFLAGS_PATH)\lib\gflags_static.lib"
GFLAGS_LNK = $(STATIC_GFLAGS_LNK)
DEPENDENCIES_INC += $(GFLAGS_INC)
SWIG_INC += $(GFLAGS_SWIG)
DEPENDENCIES_LNK += $(GFLAGS_LNK)
############
@@ -302,6 +308,9 @@ DYNAMIC_GLOG_LNK = "$(WINDOWS_GLOG_PATH)\lib\glog.lib"
STATIC_GLOG_LNK = "$(WINDOWS_GLOG_PATH)\lib\glog.lib"
GLOG_LNK = $(STATIC_GLOG_LNK)
DEPENDENCIES_INC += $(GLOG_INC)
SWIG_INC += $(GLOG_SWIG)
DEPENDENCIES_LNK += $(GLOG_LNK)
################
@@ -343,6 +352,9 @@ DYNAMIC_PROTOBUF_LNK = "$(WINDOWS_PROTOBUF_PATH)\lib\libprotobuf.lib"
STATIC_PROTOBUF_LNK = "$(WINDOWS_PROTOBUF_PATH)\lib\libprotobuf.lib"
PROTOBUF_LNK = $(STATIC_PROTOBUF_LNK)
DEPENDENCIES_INC += $(PROTOBUF_INC)
SWIG_INC += $(PROTOBUF_SWIG)
DEPENDENCIES_LNK += $(PROTOBUF_LNK)
# Install Java protobuf
@@ -393,6 +405,9 @@ STATIC_ABSL_LNK = \
DYNAMIC_ABSL_LNK = $(STATIC_ABSL_LNK)
ABSL_LNK = $(STATIC_ABSL_LNK)
DEPENDENCIES_INC += $(ABSL_INC)
SWIG_INC += $(ABSL_SWIG)
DEPENDENCIES_LNK += $(ABSL_LNK)
############
@@ -494,6 +509,8 @@ COIN_LNK = \
$(OSI_LNK) \
$(COINUTILS_LNK)
DEPENDENCIES_INC += $(COIN_INC)
SWIG_INC += $(COIN_SWIG)
DEPENDENCIES_LNK += $(COIN_LNK)
#########################
@@ -531,6 +548,9 @@ $(SCIP_SRCDIR)/CMakeLists.txt: | dependencies/sources
SCIP_INC = /I"$(OR_TOOLS_TOP)"\\dependencies\\install\\include /DUSE_SCIP /DNO_CONFIG_HEADER
SCIP_SWIG = $(SCIP_INC)
SCIP_LNK = "$(OR_TOOLS_TOP)"\\dependencies\\install\\lib\\libscip.lib
DEPENDENCIES_INC += $(SCIP_INC)
SWIG_INC += $(SCIP_SWIG)
DEPENDENCIES_LNK += $(SCIP_LNK)
############

7
makefiles/Makefile.unix.mk
View File

@@ -104,9 +104,8 @@ else
SWIG_INC =
endif
SWIG_INC += \
$(GFLAGS_SWIG) $(GLOG_SWIG) $(PROTOBUF_SWIG) $(COIN_SWIG) \
-DUSE_GLOP -DUSE_BOP -DABSL_MUST_USE_RESULT \
$(GLPK_SWIG) $(SCIP_SWIG) $(CPLEX_SWIG)
$(GLPK_SWIG) $(CPLEX_SWIG)
# Compilation flags
DEBUG = -O4 -DNDEBUG
@@ -209,10 +208,8 @@ ifeq ($(PLATFORM),MACOSX)
endif # ifeq ($(PLATFORM),MACOSX)
DEPENDENCIES_INC = -I$(INC_DIR) -I$(GEN_DIR) \
$(GFLAGS_INC) $(GLOG_INC) $(PROTOBUF_INC) \
$(COIN_INC) \
-Wno-deprecated -DUSE_GLOP -DUSE_BOP \
$(GLPK_INC) $(SCIP_INC) $(CPLEX_INC)
$(GLPK_INC) $(CPLEX_INC)
CFLAGS = $(DEBUG) $(DEPENDENCIES_INC) -DOR_TOOLS_MAJOR=$(OR_TOOLS_MAJOR) -DOR_TOOLS_MINOR=$(OR_TOOLS_MINOR)
JNIFLAGS = $(JNIDEBUG) $(DEPENDENCIES_INC)

7
makefiles/Makefile.win.mk
View File

@@ -120,9 +120,8 @@ ifdef WINDOWS_CPLEX_DIR
endif
SWIG_INC = \
$(ZLIB_SWIG) $(GFLAGS_SWIG) $(GLOG_SWIG) $(PROTOBUF_SWIG) $(CLP_SWIG) $(CBC_SWIG) \
-DUSE_GLOP -DUSE_BOP -DABSL_MUST_USE_RESULT \
$(GLPK_SWIG) $(SCIP_SWIG) $(GUROBI_SWIG) $(CPLEX_SWIG)
$(GLPK_SWIG) $(GUROBI_SWIG) $(CPLEX_SWIG)
SYS_LNK = psapi.lib ws2_32.lib shlwapi.lib
@@ -132,10 +131,8 @@ JAVA_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\java")
JAR_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\jar")
DEPENDENCIES_INC = /I$(INC_DIR) /I$(GEN_DIR) \
$(ZLIB_INC) $(GFLAGS_INC) $(GLOG_INC) $(PROTOBUF_INC) \
$(COIN_INC) \
/DUSE_GLOP /DUSE_BOP \
$(GLPK_INC) $(SCIP_INC) $(GUROBI_INC) $(CPLEX_INC)
$(GLPK_INC) $(GUROBI_INC) $(CPLEX_INC)
CFLAGS = $(DEBUG) $(DEPENDENCIES_INC) /DOR_TOOLS_MAJOR=$(OR_TOOLS_MAJOR) /DOR_TOOLS_MINOR=$(OR_TOOLS_MINOR)
JNIFLAGS=$(CFLAGS) $(DEPENDENCIES_INC)