Get unit-tests building with g++ 4.8.1

This commit is contained in:
Joe Thornber
2013-06-25 14:18:38 +01:00
parent eb8d4c6f0b
commit 730f3b9f9a
5 changed files with 15 additions and 8 deletions

View File

@@ -21,6 +21,9 @@ GMOCK_INCLUDES=\
-Igmock-1.6.0/include \
-Igmock-1.6.0/gtest/include
GMOCK_FLAGS=\
-Wno-unused-local-typedefs
GMOCK_LIBS=\
-Llib -lpdata -lgmock -lpthread
@@ -67,7 +70,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
%.gmo: %.cc
@echo " [CXX] $<"
$(V) $(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) -o $@ $<
$(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $<
unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
@echo " [LD] $<"
@@ -76,4 +79,4 @@ unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
.PHONEY: unit-test
unit-test: unit-tests/unit_tests
unit-tests/unit_tests
unit-tests/unit_tests