* tests/accu/Makefile.am (tuple): Add conditions. * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 10 ++++++++++ milena/tests/accu/Makefile.am | 15 ++++++++++++--- .../cond_tests_boost-preprocessor_boost-tuple | 1 + milena/tests/unit_test/unit-tests.mk | 14 ++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple diff --git a/milena/ChangeLog b/milena/ChangeLog index f655e6b..1342922 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-08-12 Guillaume Lazzara <z@lrde.epita.fr> + Make Boost dependent tests conditional. + + * tests/accu/Makefile.am (tuple): Add conditions. + + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-12 Guillaume Lazzara <z@lrde.epita.fr> + Small fixes in Milena. * mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 60beb52..cefa42c 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -36,8 +36,7 @@ check_PROGRAMS = \ transform_diagonal \ transform_directional \ transform_line \ - transform_snake \ - tuple + transform_snake all_accus_SOURCES = all_accus.cc compute_SOURCES = compute.cc @@ -51,6 +50,16 @@ transform_diagonal_SOURCES = transform_diagonal.cc transform_directional_SOURCES = transform_directional.cc transform_line_SOURCES = transform_line.cc transform_snake_SOURCES = transform_snake.cc + + +if HAVE_BOOST_PREPROCESSOR +if HAVE_BOOST_TUPLE + +check_PROGRAMS += tuple tuple_SOURCES = tuple.cc +endif HAVE_BOOST_TUPLE +endif HAVE_BOOST_PREPROCESSOR + + TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple b/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple new file mode 100644 index 0000000..ce2b5cc --- /dev/null +++ b/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple @@ -0,0 +1 @@ +mln/accu/tuple.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 31dddae..5751682 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -3,6 +3,18 @@ check_PROGRAMS = # Starting a conditional unit test list. +if HAVE_BOOST_PREPROCESSOR +if HAVE_BOOST_TUPLE +check_PROGRAMS += \ +mln_accu_tuple + +mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${BOOST_PREPROCESSOR_CPPFLAGS} ${AM_CPPFLAGS} +mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${BOOST_PREPROCESSOR_LDFLAGS} ${AM_LDFLAGS} +mln_accu_tuple_SOURCES = mln_accu_tuple.cc +endif HAVE_BOOST_TUPLE +endif HAVE_BOOST_PREPROCESSOR + +# Starting a conditional unit test list. if HAVE_CFITSIO check_PROGRAMS += \ mln_io_fits_all \ @@ -152,7 +164,6 @@ mln_accu_transform_directional \ mln_accu_transform_line \ mln_accu_transform_snake \ mln_accu_transform_stop \ -mln_accu_tuple \ mln_accu_v \ mln_algebra_all \ mln_algebra_essential \ @@ -1472,7 +1483,6 @@ mln_accu_transform_directional_SOURCES = mln_accu_transform_directional.cc mln_accu_transform_line_SOURCES = mln_accu_transform_line.cc mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_transform_stop_SOURCES = mln_accu_transform_stop.cc -mln_accu_tuple_SOURCES = mln_accu_tuple.cc mln_accu_v_SOURCES = mln_accu_v.cc mln_algebra_all_SOURCES = mln_algebra_all.cc mln_algebra_essential_SOURCES = mln_algebra_essential.cc -- 1.5.6.5