From aa93a7193112307eb8aa6cab8f8d91ccf8cf1956 Mon Sep 17 00:00:00 2001 From: David Baird Date: Sun, 6 Nov 2016 11:20:26 -0500 Subject: [PATCH] Fix commands in gtest.mk to build gtest-all.o. --- test/gtest.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/gtest.mk b/test/gtest.mk index cbf9860..1825e6b 100644 --- a/test/gtest.mk +++ b/test/gtest.mk @@ -6,7 +6,7 @@ LDLIBS += -lpthread LDLIBS += -lstdc++ vpath %.cc $(GTEST_PATH)/src -GTEST_FOUND = $(ls -d $(GTEST_PATH)/src/main.cc) +GTEST_FOUND = $(shell ls -d $(GTEST_PATH)/src/gtest-all.cc) ifeq (,$(GTEST_FOUND)) $(info ) $(info Error:) @@ -17,5 +17,8 @@ ifeq (,$(GTEST_FOUND)) $(error Please setup GTEST_PATH so that gtest-all.cc can be found.) endif +.PHONY: all gtest_clean all: +gtest_clean: + -rm gtest-all.o gtest-all.o: CXXFLAGS += -I$(GTEST_PATH)