summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorArseny Kapoulkine <arseny.kapoulkine@gmail.com>2016-01-26 20:28:10 -0800
committerArseny Kapoulkine <arseny.kapoulkine@gmail.com>2016-01-26 20:28:10 -0800
commitc3d27daf8e3dc95eb7ae38e66cd827eb061f7b99 (patch)
tree326968aa46f817118e43280a1f1d966eaff46673 /Makefile
parente133764f33572c9bca205b0c19fc981df48e7e15 (diff)
parente017a22fe016d3e856fb67d95ecc24cd0bd701ea (diff)
Merge pull request #83 from ogdf/use-real-standards-only
Add cxxstd Makefile argument for testing C++ standards
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 777b82b..cd03002 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,10 @@ MAKEFLAGS+=-r
config=debug
defines=standard
+cxxstd=c++11
+# set cxxstd=any to disable use of -std=...
-BUILD=build/make-$(CXX)-$(config)-$(defines)
+BUILD=build/make-$(CXX)-$(config)-$(defines)-$(cxxstd)
SOURCES=src/pugixml.cpp $(filter-out tests/fuzz_%,$(wildcard tests/*.cpp))
EXECUTABLE=$(BUILD)/test
@@ -47,9 +49,8 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),)
CXXFLAGS+=-fno-exceptions
endif
-ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
- # Can't use std=c++11 since Travis-CI has gcc 4.6.3
- CXXFLAGS+=-std=c++0x
+ifneq ($(cxxstd),any)
+ CXXFLAGS+=-std=$(cxxstd)
endif
OBJECTS=$(SOURCES:%=$(BUILD)/%.o)