diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
| commit | 821908d2773d0ba9dd76126f1dbbb9759ba7c4ff (patch) | |
| tree | 8bef42bee1061ae474a9127b5e77bdcf5504dc71 /test/wscript | |
| parent | 16fee74d60a2da1beb11e3aa4f3305e68978d88a (diff) | |
Make 2.0 branch parallel installable with 1.x.
Diffstat (limited to 'test/wscript')
| -rw-r--r-- | test/wscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/wscript b/test/wscript index 59e003ac2..3345d9eb8 100644 --- a/test/wscript +++ b/test/wscript @@ -12,8 +12,8 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' - obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' - obj.use = 'libdcpomatic' + obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK' + obj.use = 'libdcpomatic2' obj.source = """ 4k_test.cc audio_analysis_test.cc @@ -65,7 +65,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'long-unit-tests' obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' - obj.use = 'libdcpomatic' + obj.use = 'libdcpomatic2' obj.source = """ test.cc """ |