cmd = './waf configure --prefix=%s' % target.directory
if target.platform == 'linux':
cmd += ' --static'
- if target.distro == 'centos':
- # 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 == 'centos' or (target.distro == 'ubuntu' and target.version == '16.04'):
+ cmd += ' --static-boost-test'
elif target.platform == 'windows':
cmd += ' --target-windows'
opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
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('--static-boost-test', action='store_true', default=False, help='boost test library will be statically linked')
def configure(conf):
conf.load('compiler_cxx')
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.STATIC = conf.options.static
- conf.env.DISABLE_TESTS = conf.options.disable_tests
conf.env.API_VERSION = API_VERSION
if conf.options.target_windows:
boost_lib_suffix = ''
conf.env.append_value('CXXFLAGS', '-DLIBCXML_POSIX')
+ if not conf.options.static_boost_test:
+ conf.env.append_value('CXXFLAGS', '-DBOOST_TEST_DYN_LINK')
+
conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
conf.check_cxx(fragment="""
lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_FILESYSTEM')
- if not conf.options.disable_tests:
- conf.check_cxx(fragment="""
- #define BOOST_TEST_MODULE Config test\n
- #include <boost/test/unit_test.hpp>\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.check_cxx(fragment="""
+ #define BOOST_TEST_MODULE Config test\n
+ #include <boost/test/unit_test.hpp>\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')
+ conf.recurse('test')
def build(bld):
install_path='${LIBDIR}/pkgconfig')
bld.recurse('src')
- if not bld.env.DISABLE_TESTS:
- bld.recurse('test')
+ bld.recurse('test')