* tests/tests.mk
(GDCM_CPPFLAGS, GDCM_LDFLAGS)
(CFITSIO_CPPFLAGS, CFITSIO_LDFLAGS)
(MAGICKXX_CPPFLAGS, MAGICKXX_LDFLAGS)
(TIFF_CPPFLAGS, TIFF_LDFLAGS):
New variables.
---
milena/ChangeLog | 11 +++++++++++
milena/tests/tests.mk | 16 ++++++++++++++++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index b6992d2..c977f5a 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,14 @@
+2009-06-10 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Set flags for optional dependencies in tests.
+
+ * tests/tests.mk
+ (GDCM_CPPFLAGS, GDCM_LDFLAGS)
+ (CFITSIO_CPPFLAGS, CFITSIO_LDFLAGS)
+ (MAGICKXX_CPPFLAGS, MAGICKXX_LDFLAGS)
+ (TIFF_CPPFLAGS, TIFF_LDFLAGS):
+ New variables.
+
2009-06-09 Roland Levillain <roland(a)lrde.epita.fr>
Aestetic changes and cleanup in documentation and comments.
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index b10dee4..9ca0803 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -34,5 +34,21 @@ AM_CXXFLAGS = $(TESTS_CXXFLAGS)
TESTS_CXXFLAGS_SPEED = @TESTS_CXXFLAGS_SPEED@
TESTS_CXXFLAGS_DEBUG = @TESTS_CXXFLAGS_DEBUG@
+
+# Flags for optional dependencies.
+
+GDCM_CPPFLAGS = @GDCM_CPPFLAGS@
+GDCM_LDFLAGS = @GDCM_LDFLAGS@
+
+CFITSIO_CPPFLAGS = @CFITSIO_CPPFLAGS@
+CFITSIO_LDFLAGS = @CFITSIO_LDFLAGS@
+
+MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@
+MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@
+
+TIFF_CPPFLAGS = @TIFF_CPPFLAGS@
+TIFF_LDFLAGS = @TIFF_LDFLAGS@
+
+
# Inject rules to compile tests (recursively), without running them.
include $(top_srcdir)/milena/tests/tests-recursive.mk
--
1.6.2.4
Show replies by date