Make googletest a submodule

10 years ago · 16f6dac8e8
parent fede51f7b7
commit 16f6dac8e8
4 changed files with 10 additions and 10 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -12,3 +12,6 @@
 [submodule "third_party/gflags"]
 	path = third_party/gflags
 	url = https://github.com/gflags/gflags.git
+[submodule "third_party/googletest"]
+	path = third_party/googletest
+	url = git://github.com/google/googletest
--- a/8
+++ b/8
@ -299,11 +299,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 = @:
@ -612,6 +608,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
--- 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
--- a/third_party/googletest
+++ b/third_party/googletest
@ -0,0 +1 @@
+Subproject commit c80449247c0e3032401297edf19a1be8078900cc
				`@ -0,0 +1 @@`
				`Subproject commit c80449247c0e3032401297edf19a1be8078900cc`