Commit 04569a2b authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

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.
parent ebad60a1
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.
# 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)
......@@ -2,6 +2,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 += \
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment