From 911c706bdd84e7efe05f373131a6fd8b9314f159 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 23:05:34 +0100 Subject: Previous does not work; instead, disable test building on Linux with --static. --- wscript | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index f88bbbe..4b96333 100644 --- a/wscript +++ b/wscript @@ -5,6 +5,7 @@ def options(opt): opt.load('compiler_cxx') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') 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') def configure(conf): conf.load('compiler_cxx') @@ -12,6 +13,7 @@ def configure(conf): conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.STATIC = conf.options.static + conf.env.DISABLE_TESTS = conf.options.disable_tests if conf.options.target_windows: boost_lib_suffix = '-mt' @@ -28,19 +30,18 @@ def configure(conf): libpath='/usr/local/lib', lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_FILESYSTEM') - - conf.check_cxx(fragment=""" - #define BOOST_TEST_MODULE Config test\n - #include \n - int main() {} - """, - msg='Checking for boost unit testing library', - lib=['boost_unit_test_framework%s' % boost_lib_suffix, - 'boost_test_exec_monitor%s' % boost_lib_suffix, - 'boost_system%s' % boost_lib_suffix], - uselib_store='BOOST_TEST') - - conf.recurse('test') + + if not conf.options.disable_tests: + conf.check_cxx(fragment=""" + #define BOOST_TEST_MODULE Config test\n + #include \n + int main() {} + """, + msg='Checking for boost unit testing library', + lib=['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + uselib_store='BOOST_TEST') + + conf.recurse('test') def build(bld): @@ -51,4 +52,5 @@ def build(bld): install_path='${LIBDIR}/pkgconfig') bld.recurse('src') - bld.recurse('test') + if not bld.env.DISABLE_TESTS: + bld.recurse('test') -- cgit v1.2.3