From 6bbbdb7d7e4c34ef45b103edadbed1bf8e8b00de Mon Sep 17 00:00:00 2001
From: Stephan Beyer <s-beyer@gmx.net>
Date: Sun, 24 Jan 2016 19:52:49 +0100
Subject: Make cxxstd an argument to Makefile

This determines the used C++ standard.
If you do not want to use a specific C++ standard, use cxxstd=any.
The default is set to c++11.

The "define" PUGIXML_NO_CXX11 is removed from the Makefile
since it is not used in the code anyways.
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile')

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)
-- 
cgit v1.2.3