From be5cf0e3bacbcc1282132df077fef1870711f799 Mon Sep 17 00:00:00 2001 From: Niels Date: Thu, 4 Aug 2016 07:33:44 +0200 Subject: [PATCH] forgot to pass CPPFLAGS --- test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 0d4edec7..d11e1e34 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,7 +4,7 @@ # additional flags CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Weffc++ -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wfloat-equal -INCDIRS = -I ../src -I . +CPPFLAGS += -I ../src -I . SOURCES = src/unit-runner.cpp src/unit.cpp OBJECTS = $(SOURCES:.cpp=.o) @@ -15,7 +15,7 @@ json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ %.o: %.cpp - $(CXX) $(CXXFLAGS) $(INCDIRS) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ clean: rm -fr json_unit $(OBJECTS)