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

gtest: remove modified gtest-all-test.cpp, and build unmodified, vendored gtest-all.cpp

Browse source 
builds cleanly (minus a couple warnings in the test code itself) on OS X 10.10.4 with “Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)”
This commit is contained in:
Liam Staskawicz 2015-07-29 22:45:20 -07:00
parent 8865b6d917
commit 97dcc053ef
2 changed files with 7 additions and 9595 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1,8 +1,10 @@
.PHONY: all clean test
GTEST := gtest-1.7.0
LDFLAGS=-O2 -Wall -Werror -fPIC
CFLAGS=-O2 -Wall -Werror -fPIC -I. -Wno-unused-function
GTEST_CFLAGS=-I../gtest/include
GTEST_CFLAGS=-I$(GTEST)/include
all: capn.so capnpc-c test
@ -24,5 +26,8 @@ test: capn-test
%-test.o: %-test.cpp *.h *.c *.inc
$(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 gtest-all-test.o
gtest-all.o: $(GTEST)/src/*.cc
$(CXX) -g -Wall -Werror -I. $(GTEST_CFLAGS) -I$(GTEST) -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.o
$(CXX) -g -Wall -Werror -I. -o $@ $^