fix make

srz-zumix · Oct 19, 2020 · fdda1e2 · fdda1e2
1 parent 7c598c5
commit fdda1e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test/GNUmakefile b/test/GNUmakefile
@@ -419,8 +419,10 @@ $(ERR_TARGETS) : $(OUTDIR)/% : %.cpp $(IUTEST_HEADERS) $(MAKEFILE)
 else
 
 # use Google Test or Google Mock
-CXXFLAGS += -Werror $(IUTEST_CXX_WARN_FLAGS)
 include ../utils/usegtest.mk
+ifdef GTEST_SYSTEM_INCLUDED
+CXXFLAGS += -Werror $(IUTEST_CXX_WARN_FLAGS)
+endif
 
 $(BUILD_ONLY) : $(OUTDIR)/% : %.cpp $(IUTEST_HEADERS) $(MAKEFILE)
 	$(CXX) $(IUTEST_INCLUDE) $(CXXFLAGS) -o $@ $< $(LDFLAGS)

diff --git a/utils/usegtest.mk b/utils/usegtest.mk
@@ -45,7 +45,8 @@ ifdef USE_GTEST
 
 ifdef GTEST_ROOT_
 
-GTEST_INC_=-I$(GTEST_ROOT_)/include
+GTEST_INC_=-isystem$(GTEST_ROOT_)/include
+GTEST_SYSTEM_INCLUDED=1
 #GTEST_LIB_=$(GTEST_ROOT_)/make/gtest.a
 
 ifeq ($(findstring yes, $(shell test -e $(GTEST_ROOT_)/make/gtest-all.o && echo -n yes)), yes)
@@ -106,6 +107,7 @@ ifdef GMOCK_ROOT_
 
 GMOCK_INC_=-isystem$(GMOCK_ROOT_)/include -isystem$(GTEST_ROOT_)/include
 GMOCK_LIB_=$(GMOCK_ROOT_)/make/gmock-all.o $(GMOCK_ROOT_)/make/gtest-all.o
+GTEST_SYSTEM_INCLUDED=1
 
 else