Skip to content

Commit 253047f

Browse files
author
Dane Springmeyer
committed
enable -Werror, suppress warnings from non variant headers using isystem
1 parent 6317a0b commit 253047f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Makefile

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ BOOST_VERSION = 1.62.0
44
CXX := $(CXX)
55
CXX_STD ?= c++11
66

7-
BOOST_FLAGS = `$(MASON) cflags boost $(BOOST_VERSION)`
7+
BOOST_FLAGS = -isystem mason_packages/headers/boost/$(BOOST_VERSION)/include/
88
RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED -fvisibility-inlines-hidden -fvisibility=hidden
99
DEBUG_FLAGS = -O0 -g -DDEBUG -fno-inline-functions -fno-omit-frame-pointer
10-
COMMON_FLAGS = -Wall -pedantic -Wextra -Wsign-compare -Wsign-conversion -Wshadow -Wunused-parameter -std=$(CXX_STD)
10+
COMMON_FLAGS = -Wall -Werror -pedantic -Wextra -Wno-unsequenced -Wsign-compare -Wsign-conversion -Wshadow -Wfloat-conversion -Wunused-parameter -std=$(CXX_STD)
1111
CXXFLAGS := $(CXXFLAGS)
1212
LDFLAGS := $(LDFLAGS)
1313

@@ -31,31 +31,31 @@ gyp: ./deps/gyp
3131

3232
out/bench-variant-debug: Makefile mason_packages/headers/boost test/bench_variant.cpp
3333
mkdir -p ./out
34-
$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./include -Itest/include -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
34+
$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./include -isystem test/include -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
3535

3636
out/bench-variant: Makefile mason_packages/headers/boost test/bench_variant.cpp
3737
mkdir -p ./out
38-
$(CXX) -o out/bench-variant test/bench_variant.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
38+
$(CXX) -o out/bench-variant test/bench_variant.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
3939

4040
out/unique_ptr_test: Makefile mason_packages/headers/boost test/unique_ptr_test.cpp
4141
mkdir -p ./out
42-
$(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
42+
$(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
4343

4444
out/recursive_wrapper_test: Makefile mason_packages/headers/boost test/recursive_wrapper_test.cpp
4545
mkdir -p ./out
46-
$(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
46+
$(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
4747

4848
out/binary_visitor_test: Makefile mason_packages/headers/boost test/binary_visitor_test.cpp
4949
mkdir -p ./out
50-
$(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
50+
$(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
5151

5252
out/lambda_overload_test: Makefile mason_packages/headers/boost test/lambda_overload_test.cpp
5353
mkdir -p ./out
54-
$(CXX) -o out/lambda_overload_test test/lambda_overload_test.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
54+
$(CXX) -o out/lambda_overload_test test/lambda_overload_test.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
5555

5656
out/hashable_test: Makefile mason_packages/headers/boost test/hashable_test.cpp
5757
mkdir -p ./out
58-
$(CXX) -o out/hashable_test test/hashable_test.cpp -I./include -Itest/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
58+
$(CXX) -o out/hashable_test test/hashable_test.cpp -I./include -isystem test/include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS)
5959

6060
bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
6161
./out/bench-variant 100000
@@ -65,11 +65,11 @@ bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_w
6565

6666
out/unit.o: Makefile test/unit.cpp
6767
mkdir -p ./out
68-
$(CXX) -c -o $@ test/unit.cpp -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
68+
$(CXX) -c -o $@ test/unit.cpp -isystem test/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
6969

7070
out/%.o: test/t/%.cpp Makefile $(ALL_HEADERS)
7171
mkdir -p ./out
72-
$(CXX) -c -o $@ $< -Iinclude -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
72+
$(CXX) -c -o $@ $< -Iinclude -isystem test/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
7373

7474
out/unit: out/unit.o out/binary_visitor_1.o out/binary_visitor_2.o out/binary_visitor_3.o out/binary_visitor_4.o out/binary_visitor_5.o out/binary_visitor_6.o out/issue21.o out/issue122.o out/mutating_visitor.o out/optional.o out/recursive_wrapper.o out/sizeof.o out/unary_visitor.o out/variant.o
7575
mkdir -p ./out
@@ -80,7 +80,7 @@ test: out/unit
8080

8181
coverage:
8282
mkdir -p ./out
83-
$(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./include -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS)
83+
$(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./include -isystem test/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS)
8484

8585
sizes: Makefile
8686
mkdir -p ./out

0 commit comments

Comments
 (0)