@@ -4,10 +4,10 @@ BOOST_VERSION = 1.62.0
4
4
CXX := $(CXX )
5
5
CXX_STD ?= c++11
6
6
7
- BOOST_FLAGS = ` $( MASON ) cflags boost $( BOOST_VERSION) `
7
+ BOOST_FLAGS = -isystem mason_packages/headers/ boost/ $(BOOST_VERSION ) /include/
8
8
RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED -fvisibility-inlines-hidden -fvisibility=hidden
9
9
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 )
11
11
CXXFLAGS := $(CXXFLAGS )
12
12
LDFLAGS := $(LDFLAGS )
13
13
@@ -31,31 +31,31 @@ gyp: ./deps/gyp
31
31
32
32
out/bench-variant-debug : Makefile mason_packages/headers/boost test/bench_variant.cpp
33
33
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 )
35
35
36
36
out/bench-variant : Makefile mason_packages/headers/boost test/bench_variant.cpp
37
37
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 )
39
39
40
40
out/unique_ptr_test : Makefile mason_packages/headers/boost test/unique_ptr_test.cpp
41
41
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 )
43
43
44
44
out/recursive_wrapper_test : Makefile mason_packages/headers/boost test/recursive_wrapper_test.cpp
45
45
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 )
47
47
48
48
out/binary_visitor_test : Makefile mason_packages/headers/boost test/binary_visitor_test.cpp
49
49
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 )
51
51
52
52
out/lambda_overload_test : Makefile mason_packages/headers/boost test/lambda_overload_test.cpp
53
53
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 )
55
55
56
56
out/hashable_test : Makefile mason_packages/headers/boost test/hashable_test.cpp
57
57
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 )
59
59
60
60
bench : out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
61
61
./out/bench-variant 100000
@@ -65,11 +65,11 @@ bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_w
65
65
66
66
out/unit.o : Makefile test/unit.cpp
67
67
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 )
69
69
70
70
out/% .o : test/t/% .cpp Makefile $(ALL_HEADERS )
71
71
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 )
73
73
74
74
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
75
75
mkdir -p ./out
@@ -80,7 +80,7 @@ test: out/unit
80
80
81
81
coverage :
82
82
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 )
84
84
85
85
sizes : Makefile
86
86
mkdir -p ./out
0 commit comments