X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=e161c82d5b0037e0e1793369ea1091f50572e0cc;hb=0caa6358a49c66d52d2af090bd2a130203673807;hp=88df9177fb7834f8ffcc0065f51b87ea94713ee4;hpb=cd92063f7c67093ac789cb3aa78e534a3a85ef92;p=dcpomatic.git diff --git a/test/wscript b/test/wscript index 88df9177f..e161c82d5 100644 --- a/test/wscript +++ b/test/wscript @@ -30,14 +30,11 @@ def configure(conf): int main() {} """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST') - if conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) is None: - conf.check_cfg(package='Magick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=True) - def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' - obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE MAGICK PNG ' + obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG ' obj.uselib += 'LEQM_NRT ZIP ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '