Optionally (with --c++17) use libxml++-4.0 and C++17.

diff --git a/libcxml.pc.in b/libcxml.pc.in
index 8b7c15cf7efd43519d5476dcbf963d4e9a1e95ec..0632a1458ac35719b858a4fbb2cb88f3e9cb9311 100644 (file)
--- a/libcxml.pc.in
+++ b/libcxml.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 Name: libcxml
 Description: Library to simplify XML parsing with libxml++
 Version: @version@
-Requires: libxml++-2.6 glibmm-2.4
+Requires: libxml++-@xmlpp_api@ glibmm-@glibmm_api@
 Libs: @libs@
 Cflags: -I${includedir}

diff --git a/src/cxml.cc b/src/cxml.cc
index 75da11f76749574287e584e27c7330b918950d98..d5c3fdbdfacaf95be168d21c6bd9914ef4c21987 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -105,14 +105,16 @@ cxml::Node::node_children (string name) const
                throw cxml::Error("Node has no internal xmlpp node; did you forget to call a read method on cxml::Document?");
        }
 
+       auto const glib_name = Glib::ustring(name);
+
        vector<shared_ptr<cxml::Node>> n;
        for (auto i: _node->get_children()) {
-               if (i->get_name() == name) {
+               if (i->get_name() == glib_name) {
                        n.push_back(make_shared<Node>(i));
                }
        }
 
-       _taken.push_back (name);
+       _taken.push_back(glib_name);
        return n;
 }
 
@@ -215,7 +217,7 @@ void
 cxml::Node::done () const
 {
        for (auto i: _node->get_children()) {
-               if (dynamic_cast<xmlpp::Element *> (i) && find (_taken.begin(), _taken.end(), i->get_name()) == _taken.end ()) {
+               if (dynamic_cast<xmlpp::Element*>(i) && find(_taken.begin(), _taken.end(), i->get_name()) == _taken.end()) {
                        throw cxml::Error ("unexpected XML node " + i->get_name());
                }
        }
@@ -304,7 +306,7 @@ cxml::Document::take_root_node ()
        }
 
        _node = _parser->get_document()->get_root_node ();
-       if (!_root_name.empty() && _node->get_name() != _root_name) {
+       if (!_root_name.empty() && _node->get_name() != Glib::ustring(_root_name)) {
                throw cxml::Error ("unrecognised root node " + _node->get_name() + " (expecting " + _root_name + ")");
        } else if (_root_name.empty ()) {
                _root_name = _node->get_name ();
@@ -475,12 +477,16 @@ cxml::raw_convert (string v)
 xmlpp::Element*
 cxml::add_child(xmlpp::Element* parent, string const& name, string const& ns_prefix)
 {
+#if LIBXMLXX_MAJOR_VERSION == 2
        return parent->add_child(name, ns_prefix);
+#else
+       return parent->add_child_element(name, ns_prefix);
+#endif
 }
 
 
 void
 cxml::add_text_child(xmlpp::Element* parent, string const& name, string const& text)
 {
-       parent->add_child(name)->add_child_text(text);
+       add_child(parent, name)->add_child_text(text);
 }

diff --git a/src/cxml.h b/src/cxml.h
index e6130399bef0d84eab6625e6af9308273cd4e6df..1dd43cdd5b8af4a1921fef83dee51df941bfe7b0 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -21,6 +21,7 @@
 #ifndef LIBCXML_CXML_H
 #define LIBCXML_CXML_H
 
+#include <glibmm/ustring.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/erase.hpp>
@@ -238,7 +239,7 @@ protected:
        xmlpp::Node* _node;
 
 private:
-       mutable std::vector<std::string> _taken;
+       mutable std::vector<Glib::ustring> _taken;
 };
 
 typedef std::shared_ptr<cxml::Node> NodePtr;

diff --git a/wscript b/wscript
index 7fabc25f827c40a90ae0b121da5ad78da79c0e13..b71f4f62a5956296ee0bd2786f6ad0910ea7d541 100644 (file)
--- a/wscript
+++ b/wscript
@@ -41,12 +41,23 @@ def options(opt):
     opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--static', action='store_true', default=False, help='build statically')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
+    opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0')
 
 def configure(conf):
     conf.load('compiler_cxx')
+
+    if vars(conf.options)['c++17']:
+        cpp_std = '17'
+        conf.env.XMLPP_API = '4.0'
+        conf.env.GLIBMM_API = '2.68'
+    else:
+        cpp_std = '11'
+        conf.env.XMLPP_API = '2.6'
+        conf.env.GLIBMM_API = '2.4'
+
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', '-g')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-Wno-deprecated-declarations', '-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-Wno-deprecated-declarations', '-std=c++' + cpp_std, '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows_32 or conf.options.target_windows_64
     conf.env.STATIC = conf.options.static
@@ -60,7 +71,7 @@ def configure(conf):
         boost_lib_suffix = ''
         conf.env.append_value('CXXFLAGS', '-DLIBCXML_POSIX')
 
-    conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+    conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
 
     conf.check_cxx(fragment="""
                   #include <boost/filesystem.hpp>\n
@@ -84,12 +95,13 @@ def configure(conf):
         conf.recurse('test')
 
 def build(bld):
-
     bld(source='libcxml.pc.in',
         version=VERSION,
         includedir='%s/include' % bld.env.PREFIX,
         libs="-L${libdir} -lcxml",
-        install_path='${LIBDIR}/pkgconfig')
+        install_path='${LIBDIR}/pkgconfig',
+        xmlpp_api=bld.env.XMLPP_API,
+        glibmm_api=bld.env.GLIBMM_API)
 
     bld.recurse('src')
     if not bld.env.DISABLE_TESTS: