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

Fix protobuf dynamic dir on MacOS

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-07-03 11:47:38 +02:00
parent 77c2aff0a6
commit a636eafb50
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,10 +218,14 @@ PROTOBUF_PROTOC_INC = $(PROTOBUF_INC)
# libprotobuf.a goes in a different subdirectory depending on the distribution
# and architecture, eg. "lib/" or "lib64/" for Fedora and Centos,
# "lib/x86_64-linux-gnu/" for Ubuntu (all on 64 bits), etc. So we wildcard it.
STATIC_PROTOBUF_LNK = $(wildcard $(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.a \
$(UNIX_PROTOBUF_DIR)/lib/*/libprotobuf.a)
_PROTOBUF_LIB_DIR = $(wildcard $(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.$L \
$(UNIX_PROTOBUF_DIR)/lib/*/libprotobuf.$L)
STATIC_PROTOBUF_LNK = $(wildcard \
$(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.a \
$(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.a@ \
$(UNIX_PROTOBUF_DIR)/lib/*/libprotobuf.a)
_PROTOBUF_LIB_DIR = $(wildcard \
$(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.$L \
$(UNIX_PROTOBUF_DIR)/lib*/libprotobuf.$L@ \
$(UNIX_PROTOBUF_DIR)/lib/*/libprotobuf.$L)
DYNAMIC_PROTOBUF_LNK = -L$(dir $(_PROTOBUF_LIB_DIR)) -lprotobuf
ifeq ($(UNIX_PROTOBUF_DIR), $(OR_TOOLS_TOP)/dependencies/install)