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

gtest: integrate as git submodule

Browse source
This commit is contained in:
David Lamparter 2016-03-18 23:56:50 +01:00
parent 811d3046e1
commit 93351266ee
4 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile.am
View file

@ -35,8 +35,12 @@ noinst_HEADERS += \
compiler/c++.capnp.h \
compiler/test.capnp.h
if GTEST
AM_CXXFLAGS = -std=gnu++11
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 = \
@ -45,7 +49,8 @@ capn_test_SOURCES = \
compiler/test.capnp.c \
compiler/schema-test.cpp \
compiler/schema.capnp.c
capn_test_CFLAGS = $(GTEST_CFLAGS)
capn_test_LDADD = libcapnp_c.la $(GTEST_LDFLAGS)
TESTS = capn-test
endif
capn_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_CPPFLAGS)
capn_test_CXXFLAGS = -std=gnu++11 -pthread
capn_test_LDADD = libcapnp_c.la $(GTEST_LDADD)
capn_test_LDFLAGS = -pthread
TESTS = capn-test