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

[libcxml.git] / cscript

diff --git a/cscript b/cscript
index 2d2d2f2516c5b0d6e9a19afac719893acf5dd265..310460297a2a240c4ca7ed461224c66aee13692a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,3 +1,23 @@
+# -*- mode: python -*-
+#
+#    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libcxml.
+#
+#    libcxml is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libcxml is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
 def build(target, options):
@@ -8,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':
-            cmd += ' --check-cxx-compiler=g++-4.9'
     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')