Revert "gtest: Use system gtest and pthread libs"
This reverts commit 9fe7167920.
(this makes the following merge easier)
This commit is contained in:
parent
6ebba52da2
commit
aeeae64900
2 changed files with 9595 additions and 2 deletions
4
Makefile
4
Makefile
|
|
@ -24,5 +24,5 @@ test: capn-test
|
||||||
%-test.o: %-test.cpp *.h *.c *.inc
|
%-test.o: %-test.cpp *.h *.c *.inc
|
||||||
$(CXX) -g -Wall -Werror -I. $(GTEST_CFLAGS) -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. -lpthread -lgtest -o $@ $^
|
$(CXX) -g -Wall -Werror -I. -o $@ $^
|
||||||
|
|
|
||||||
9593
gtest-all-test.cpp
Normal file
9593
gtest-all-test.cpp
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue