rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop gtest submodule and use system one.

Browse source
This commit is contained in:
Alexis Ballier 2016-06-06 10:15:38 +02:00
parent 75f79010f6
commit de5a960adb
3 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "gtest"]
path = gtest
url = https://github.com/google/googletest.git

10
Makefile.am
View file

@ -45,12 +45,6 @@ noinst_HEADERS += \
compiler/c++.capnp.h \ compiler/c++.capnp.h \
compiler/test.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 += \ check_PROGRAMS += \
capn-test capn-test
capn_test_SOURCES = \ capn_test_SOURCES = \
@ -59,8 +53,8 @@ capn_test_SOURCES = \
compiler/test.capnp.c \ compiler/test.capnp.c \
compiler/schema-test.cpp \ compiler/schema-test.cpp \
compiler/schema.capnp.c 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_CXXFLAGS = -std=gnu++11 -pthread
capn_test_LDADD = libcapnp_c.la $(GTEST_LDADD) capn_test_LDADD = libcapnp_c.la -lgtest
capn_test_LDFLAGS = -pthread capn_test_LDFLAGS = -pthread
TESTS = capn-test TESTS = capn-test

2
configure.ac
View file

@ -44,8 +44,6 @@ AC_SUBST(capnpdir)
# AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found]) # AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found])
#]) #])
AC_CONFIG_SUBDIRS([gtest/googletest])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
c-capnproto.pc c-capnproto.pc