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

Integrate gtest in rather than use gtest-config

Browse source
This commit is contained in:
James McKaskill 2013-12-10 20:33:33 -05:00
parent ff44e4df26
commit df3e668f79
2 changed files with 9597 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -2,6 +2,7 @@
LDFLAGS=-O2 -Wall -Werror -fPIC LDFLAGS=-O2 -Wall -Werror -fPIC
CFLAGS=-O2 -Wall -Werror -fPIC -I. -Wno-unused-function CFLAGS=-O2 -Wall -Werror -fPIC -I. -Wno-unused-function
GTEST_CFLAGS=-I../gtest/include
all: capn.so capnpc-c test all: capn.so capnpc-c test
@ -21,7 +22,7 @@ test: capn-test
./capn-test ./capn-test
%-test.o: %-test.cpp *.h *.c *.inc %-test.o: %-test.cpp *.h *.c *.inc
$(CXX) -g -Wall -Werror -I. `gtest-config --cppflags --cxxflags` -o $@ -c $< $(CXX) -g -Wall -Werror -I. $(GTEST_CFLAGS) -o $@ -c $<
capn-test: capn-test.o capn-stream-test.o compiler/test.capnp.o compiler/schema-test.o compiler/schema.capnp.o capn-test: capn-test.o capn-stream-test.o compiler/test.capnp.o compiler/schema-test.o compiler/schema.capnp.o gtest-all-test.o
$(CXX) -g -Wall -Werror -I. `gtest-config --ldflags --libs` -o $@ $^ $(CXX) -g -Wall -Werror -I. -o $@ $^

9593
gtest-all-test.cpp Normal file
View file

File diff suppressed because it is too large Load diff