diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-12-31 18:59:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-12-31 18:59:23 +0000 |
| commit | 3b00a59febd1920037cb0a6027b3757edaaaff2b (patch) | |
| tree | 113a7975f4014e1f722293ad26c17023597f0801 | |
| parent | 7ba51b76ef6a04286d94b05171d4c24f55a44d6a (diff) | |
Try to fix build on OS X.
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | wscript | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/test/test.cc b/test/test.cc index dff7800ce..edeb89925 100644 --- a/test/test.cc +++ b/test/test.cc @@ -239,7 +239,7 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check) /* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it; this may cause random test failures on platforms that use GraphicsMagick. */ -#ifdef DCPOMATIC_IMAGE_MAGICK +#ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric); BOOST_CHECK_MESSAGE (dist < 0.001, ref << " differs from " << check << " " << dist); #else @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> +# Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> # # This file is part of DCP-o-matic. # @@ -256,6 +256,17 @@ def configure(conf): includes=conf.env['INCLUDES_MAGICK'], define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE') + # See if we have advanced compare() methods in Magick + conf.check_cxx(fragment=""" + #include <Magick++.h>\n + int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); } + """, + mandatory=False, + msg='Checking for advanced compare() method in {Image/Graphics}Magick', + uselib='MAGICK', + define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE' + ) + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) |