From de5a960adb21e4aa4857bd62ed923767ab144f86 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Mon, 6 Jun 2016 10:15:38 +0200 Subject: [PATCH] Drop gtest submodule and use system one. --- .gitmodules | 3 --- Makefile.am | 10 ++-------- configure.ac | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 48294b1..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "gtest"] - path = gtest - url = https://github.com/google/googletest.git diff --git a/Makefile.am b/Makefile.am index 8622c90..65472c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,12 +45,6 @@ noinst_HEADERS += \ compiler/c++.capnp.h \ compiler/test.capnp.h -GTEST_LDADD = gtest/googletest/lib/libgtest.la -gtest/googletest/lib/libgtest.la: - make -C gtest/googletest lib/libgtest.la -GTEST_CPPFLAGS = -I${srcdir}/gtest/googletest/include -DIST_SUBDIRS = gtest/googletest - check_PROGRAMS += \ capn-test capn_test_SOURCES = \ @@ -59,8 +53,8 @@ capn_test_SOURCES = \ compiler/test.capnp.c \ compiler/schema-test.cpp \ compiler/schema.capnp.c -capn_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_CPPFLAGS) +capn_test_CPPFLAGS = $(AM_CPPFLAGS) capn_test_CXXFLAGS = -std=gnu++11 -pthread -capn_test_LDADD = libcapnp_c.la $(GTEST_LDADD) +capn_test_LDADD = libcapnp_c.la -lgtest capn_test_LDFLAGS = -pthread TESTS = capn-test diff --git a/configure.ac b/configure.ac index ed8b799..5342cda 100755 --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,6 @@ AC_SUBST(capnpdir) # AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found]) #]) -AC_CONFIG_SUBDIRS([gtest/googletest]) - AC_CONFIG_FILES([ Makefile c-capnproto.pc