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

archive: unix: Check if protobuf is in lib or lib64

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-07-13 13:34:12 +02:00
parent 8e651f5979
commit 7f453a0475
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/Makefile.cpp.mk
View File

@@ -537,7 +537,7 @@ ifeq ($(UNIX_GLOG_DIR),$(OR_TOOLS_TOP)/dependencies/install)
endif
ifeq ($(UNIX_PROTOBUF_DIR),$(OR_TOOLS_TOP)/dependencies/install)
$(COPYREC) dependencies$Sinstall$Sinclude$Sgoogle "$(DESTDIR)$(prefix)$Sinclude"
$(COPYREC) dependencies$Sinstall$Slib$Slibproto* "$(DESTDIR)$(prefix)$Slib"
$(COPYREC) $(subst /,$S,$(_PROTOBUF_LIB_DIR))$Slibproto* "$(DESTDIR)$(prefix)$Slib"
$(COPYREC) dependencies$Sinstall$Sbin$Sprotoc "$(DESTDIR)$(prefix)$Sbin"
endif
ifeq ($(UNIX_CBC_DIR),$(OR_TOOLS_TOP)/dependencies/install)

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

@@ -222,11 +222,11 @@ 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 \
_PROTOBUF_LIB_DIR = $(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
$(UNIX_PROTOBUF_DIR)/lib/*/libprotobuf.$L))
DYNAMIC_PROTOBUF_LNK = -L$(_PROTOBUF_LIB_DIR) -lprotobuf
ifeq ($(UNIX_PROTOBUF_DIR), $(OR_TOOLS_TOP)/dependencies/install)
DEPENDENCIES_LNK += $(DYNAMIC_PROTOBUF_LNK)

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

@@ -162,7 +162,9 @@ dependencies/archives/gflags-$(GFLAGS_TAG).zip:
$(WGET) --quiet -P dependencies\archives --no-check-certificate https://github.com/gflags/gflags/archive/v$(GFLAGS_TAG).zip
cd dependencies/archives && rename v$(GFLAGS_TAG).zip gflags-$(GFLAGS_TAG).zip
################
## Protobuf ##
################
# Install protocol buffers.
install_protobuf: dependencies\install\bin\protoc.exe dependencies\install\include\google\protobuf\message.h
@@ -192,6 +194,9 @@ dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\CMakeLists.txt:
$(WGET) --quiet -P dependencies\archives --no-check-certificate https://github.com/google/protobuf/archive/v$(PROTOBUF_TAG).zip
$(UNZIP) -q -d dependencies\sources dependencies\archives\v$(PROTOBUF_TAG).zip
############
## GLOG ##
############
install_glog: dependencies/install/include/glog/logging.h
dependencies/install/include/glog/logging.h: dependencies/sources/glog-$(GLOG_TAG)/CMakeLists.txt install_gflags