* mln/io/all.hh [HAVE_MAGICKXX]: Include mln/io/magick/all.hh. * tests/io/Makefile.am (SUBDIRS) [HAVE_MAGICKXX]: Add magick. * tests/io/magick/Makefile.am (AM_CPPFLAGS): Add $(MAGICKXX_CPPFLAGS) (AM_LDFLAGS): Remove -lMagick++. Add $(MAGICKXX_LDFLAGS). --- milena/ChangeLog | 11 +++++++++++ milena/mln/io/all.hh | 5 ++++- milena/tests/io/Makefile.am | 5 ++++- milena/tests/io/magick/Makefile.am | 8 +++----- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a394c72..e1d15ff 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-02 Roland Levillain <roland@lrde.epita.fr> + Add support for Magick++ in the build system. + + * mln/io/all.hh [HAVE_MAGICKXX]: Include mln/io/magick/all.hh. + * tests/io/Makefile.am (SUBDIRS) [HAVE_MAGICKXX]: Add magick. + * tests/io/magick/Makefile.am + (AM_CPPFLAGS): Add $(MAGICKXX_CPPFLAGS) + (AM_LDFLAGS): Remove -lMagick++. + Add $(MAGICKXX_LDFLAGS). + +2009-06-02 Roland Levillain <roland@lrde.epita.fr> + Add support for TIFF in the build system. * mln/io/all.hh [HAVE_TIFF]: Include mln/io/tiff/all.hh. diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 9ee7dd8..bbb47d7 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -53,7 +53,6 @@ namespace mln # include <mln/io/cloud/all.hh> # include <mln/io/dump/all.hh> # include <mln/io/dicom/load.hh> -# include <mln/io/magick/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> @@ -71,6 +70,10 @@ namespace mln # include <mln/io/fits/all.hh> # endif // ! HAVE_CFITSIO +# ifdef HAVE_MAGICKXX +# include <mln/io/magick/all.hh> +# endif // ! HAVE_MAGICKXX + # ifdef HAVE_TIFF # include <mln/io/tiff/all.hh> # endif // ! HAVE_LIBTIFF diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index ec9a83f..867e846 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -9,7 +9,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ dicom \ dump \ - magick \ off \ pbm \ pfm \ @@ -25,6 +24,10 @@ if HAVE_CFITSIO SUBDIRS += fits endif HAVE_CFITSIO +if HAVE_MAGICKXX + SUBDIRS += magick +endif HAVE_MAGICKXX + if HAVE_TIFF SUBDIRS += tiff endif HAVE_TIFF diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index c636677..62993e4 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -1,10 +1,9 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk -# FIXME: We should not use a hard-coded value. Rely on a variable set -# by configure instead. -AM_LDFLAGS = -lMagick++ +AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS) +AM_LDFLAGS = $(MAGICKXX_LDFLAGS) check_PROGRAMS = \ load \ @@ -14,5 +13,4 @@ load_SOURCES = load.cc save_SOURCES = save.cc TESTS = $(check_PROGRAMS) - XFAIL_TESTS = save -- 1.6.1.2