Some platforms don't even have libxml++ version defines.

[libcxml.git] / cscript

diff --git a/cscript b/cscript
index a95e66811a4b0e8e0d4fbcc4e12c1833b8012606..310460297a2a240c4ca7ed461224c66aee13692a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libcxml.
 #
@@ -20,9 +20,6 @@
 
 import os
 
-def dependencies(target):
-    return (('locked_sstream', None))
-
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
     if target.platform == 'linux':
@@ -31,14 +28,16 @@ def build(target, options):
             # Centos builds using static boost, which means tests don't
             # build as test/tests.cc defines BOOST_TEST_DYN_LINK
             cmd += ' --disable-tests'
-        if (target.distro == 'debian' and target.version == 'unstable') or (target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
     elif target.platform == 'windows':
-        cmd += ' --target-windows'
+        cmd += f' --target-windows-{target.bits}'
+
+    if 'c++17' in options and options['c++17']:
+        cmd += ' --c++17'
+
     target.command(cmd)
     target.command('./waf build install')
 
-def test(target):
+def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
         target.command('./run-tests.sh')