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

gtest: use installed package, drop files

Browse source 
(also makes the next merge much easier)
This commit is contained in:
David Lamparter 2016-02-28 12:08:28 +01:00
parent e67affe8cf
commit d87beb1a09
181 changed files with 4 additions and 141113 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -1,7 +1,5 @@
.PHONY: all clean test
GTEST := gtest-1.7.0
LDFLAGS=-O2 -Wall -Werror -fPIC
CFLAGS=-O2 -Wall -Werror -fPIC -I. -Wno-unused-function
ifneq (,$(findstring gcc, $(CC)))
@ -12,8 +10,8 @@ ifneq (,$(findstring gcc, $(CC)))
CFLAGS += -Wno-maybe-uninitialized
endif
GTEST_CFLAGS=-I$(GTEST)/include -std=c++11
GTEST_LDFLAGS=-lpthread
GTEST_CFLAGS=-std=c++11 `gtest-config --cppflags --cxxflags`
GTEST_LDFLAGS=`gtest-config --ldflags --libs`
all: capn.so capnpc-c test
@ -35,8 +33,5 @@ test: capn-test
%-test.o: %-test.cpp *.h *.c *.inc
$(CXX) -g -Wall -Werror -I. $(GTEST_CFLAGS) -o $@ -c $<
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. $^ $(GTEST_LDFLAGS) -o $@
capn-test: capn-test.o capn-stream-test.o compiler/test.capnp.o compiler/schema-test.o compiler/schema.capnp.o
$(CXX) -g -Wall -Werror -I. $^ $(GTEST_LDFLAGS) -o $@