diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-25 14:05:30 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-25 14:05:30 -0700 |
| commit | 9dee67b5cf52608f1dbe1142c43e8bf197cc34da (patch) | |
| tree | 6b32dce07d328651b7b59e6b5b9aa5710da2f7cd /templates/Makefile.template | |
| parent | 25de92c997117da87cfde68f97400aa32d27d814 (diff) | |
| parent | 4087ea6f9c543ec79436c45281475fefe4e33a8f (diff) | |
Merge github.com:grpc/grpc into naming-crisis
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 1b898efbdd..00582a22f8 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -313,11 +313,7 @@ LIBS = m z pthread LDFLAGS += -pthread endif -ifneq ($(wildcard /usr/src/gtest/src/gtest-all.cc),) -GTEST_LIB = /usr/src/gtest/src/gtest-all.cc -I/usr/src/gtest -else -GTEST_LIB = -lgtest -endif +GTEST_LIB = -Ithird_party/googletest/include -Ithird_party/googletest third_party/googletest/src/gtest-all.cc GTEST_LIB += -lgflags ifeq ($(V),1) E = @: @@ -637,6 +633,8 @@ PROTOBUF_PKG_CONFIG = false PC_REQUIRES_GRPCXX = PC_LIBS_GRPCXX = +CPPFLAGS := -Ithird_party/googletest/include $(CPPFLAGS) + ifeq ($(HAS_SYSTEM_PROTOBUF),true) ifeq ($(HAS_PKG_CONFIG),true) PROTOBUF_PKG_CONFIG = true |