Added gtest 1.6.0, since the included version lacked the headers

This commit is contained in:
Johan De Claville Christiansen 2014-03-25 18:55:18 +01:00
parent 1eb82b0f4a
commit bf5eb7f92c
37 changed files with 30218 additions and 9602 deletions

View file

@ -1,10 +1,8 @@
.PHONY: all clean test
LDFLAGS=-O2 -Wall -Werror -fPIC
CFLAGS=-O2 -Wall -Werror -fPIC -I. -Wno-unused-function
GTEST_CFLAGS=-I../gtest/include
LDFLAGS=-O2 -Wall -fPIC
CFLAGS=-O2 -Wall -fPIC -I. -Wno-unused-function
OBJS=capn-malloc.o capn-stream.o capn.o
prefix = /usr
all: capn.a capn.so capnpc-c test
@ -14,7 +12,7 @@ clean:
%.o: %.c *.h *.inc compiler/*.h
$(CC) $(CFLAGS) -c $< -o $@
capn.so: $(OBJS)
$(CC) -shared $(LDFLAGS) $^ -o $@
@ -28,10 +26,13 @@ test: capn-test
./capn-test
%-test.o: %-test.cpp *.h *.c *.inc
$(CXX) -g -Wall -Werror -I. $(GTEST_CFLAGS) -o $@ -c $<
$(CXX) -std=c++11 -g -I. -Igtest/include -o $@ -c $<
gtest-all.o: gtest/src/*.cc
$(CXX) -std=c++11 -g -I. -Igtest/include -Igtest -o $@ -c $<
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. -o $@ $^
capn-test: capn-test.o capn-stream-test.o compiler/test.capnp.o compiler/schema-test.o compiler/schema.capnp.o capn.a gtest-all.o -lpthread
$(CXX) -std=c++11 -g -I. -o $@ $^
install:
install -c capnpc-c $(prefix)/bin/capnpc-c