diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-13 17:10:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-22 01:21:00 +0100 |
| commit | 67c670d6cf8fb063341364eba25e4ef9530a9b66 (patch) | |
| tree | 9eb1ac903b2f6b2bb61d92cd2275ceb3395b0af3 | |
| parent | fe90ef2c3c03e1546c08be1f1ab90edd8d2eba3e (diff) | |
xerces-related build fixes.
| -rw-r--r-- | examples/wscript | 4 | ||||
| -rw-r--r-- | test/wscript | 2 | ||||
| -rw-r--r-- | wscript | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/examples/wscript b/examples/wscript index a71a215b..f7d3431a 100644 --- a/examples/wscript +++ b/examples/wscript @@ -20,7 +20,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'make_dcp' obj.use = 'libdcp%s' % bld.env.API_VERSION - obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM OPENSSL XMLSEC1' obj.source = 'make_dcp.cc' obj.target = 'make_dcp' obj.install_path = '' @@ -28,7 +28,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'read_dcp' obj.use = 'libdcp%s' % bld.env.API_VERSION - obj.uselib = 'OPENJPEG CXML MAGICK OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM' + obj.uselib = 'OPENJPEG CXML MAGICK OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM OPENSSL XMLSEC1' obj.source = 'read_dcp.cc' obj.target = 'read_dcp' obj.install_path = '' diff --git a/test/wscript b/test/wscript index ef97a849..efd551b9 100644 --- a/test/wscript +++ b/test/wscript @@ -51,7 +51,7 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'tests' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES' obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.is_defined('HAVE_GCOV'): obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION @@ -125,7 +125,11 @@ def configure(conf): Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) - conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True) + + if conf.options.target_windows: + # XXX: it feels like there should be a more elegant way to get these included + conf.env.LIB_XERCES.append('curl') + conf.env.LIB_XERCES.append('ws2_32') if conf.options.static: if conf.options.jpeg == 'oj2': @@ -140,6 +144,9 @@ def configure(conf): conf.env.HAVE_CXML = 1 conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] + conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True) + conf.env.STLIB_XERCES = ['xerces-c'] + conf.env.LIB_XERCES = ['icuuc', 'curl'] else: if conf.options.jpeg == 'oj2': conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) @@ -147,6 +154,7 @@ def configure(conf): conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' |