Commit 637d70cf authored by Roland Levillain's avatar Roland Levillain
Browse files

Catch up with Boost-related changes in configure.ac.

	* tests/accu/Makefile.am: Remove uses of the old
	HAVE_BOOST_PREPROCESSOR conditional.
	* tests/unit_test/cond_tests_boost-preprocessor_boost-tuple:
	Rename as...
	* milena/tests/unit_test/cond_tests_boost-tuple: ...this.
	* tests/unit_test/Makefile.am (COND_TESTS):
	s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/.
	* tests/unit_test/unit-tests.mk: Regen.
parent 944186e4
2010-10-21 Roland Levillain <roland@lrde.epita.fr>
Catch up with Boost-related changes in configure.ac.
* tests/accu/Makefile.am: Remove uses of the old
HAVE_BOOST_PREPROCESSOR conditional.
* tests/unit_test/cond_tests_boost-preprocessor_boost-tuple:
Rename as...
* milena/tests/unit_test/cond_tests_boost-tuple: ...this.
* tests/unit_test/Makefile.am (COND_TESTS):
s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/.
* tests/unit_test/unit-tests.mk: Regen.
2010-10-21 Guillaume Lazzara <z@lrde.epita.fr> 2010-10-21 Guillaume Lazzara <z@lrde.epita.fr>
   
Make use of value::next in Milena. Make use of value::next in Milena.
...@@ -51,15 +51,9 @@ transform_directional_SOURCES = transform_directional.cc ...@@ -51,15 +51,9 @@ transform_directional_SOURCES = transform_directional.cc
transform_line_SOURCES = transform_line.cc transform_line_SOURCES = transform_line.cc
transform_snake_SOURCES = transform_snake.cc transform_snake_SOURCES = transform_snake.cc
if HAVE_BOOST_PREPROCESSOR
if HAVE_BOOST_TUPLE if HAVE_BOOST_TUPLE
check_PROGRAMS += tuple
check_PROGRAMS += tuple tuple_SOURCES = tuple.cc
tuple_SOURCES = tuple.cc
endif HAVE_BOOST_TUPLE endif HAVE_BOOST_TUPLE
endif HAVE_BOOST_PREPROCESSOR
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
include $(top_srcdir)/milena/tests/tests.mk include $(top_srcdir)/milena/tests/tests.mk
COND_TESTS = cond_tests_boost-preprocessor_boost-tuple \ COND_TESTS = cond_tests_boost-tuple \
cond_tests_cfitsio \ cond_tests_cfitsio \
cond_tests_gdcm \ cond_tests_gdcm \
cond_tests_magickxx \ cond_tests_magickxx \
cond_tests_qt \ cond_tests_qt \
cond_tests_tiff cond_tests_tiff
EXTRA_DIST = disabled_tests \ EXTRA_DIST = disabled_tests \
......
...@@ -3,16 +3,14 @@ ...@@ -3,16 +3,14 @@
check_PROGRAMS = check_PROGRAMS =
# Starting a conditional unit test list. # Starting a conditional unit test list.
if HAVE_BOOST_PREPROCESSOR
if HAVE_BOOST_TUPLE if HAVE_BOOST_TUPLE
check_PROGRAMS += \ check_PROGRAMS += \
mln_accu_tuple mln_accu_tuple
mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${BOOST_PREPROCESSOR_CPPFLAGS} ${AM_CPPFLAGS} mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${AM_CPPFLAGS}
mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${BOOST_PREPROCESSOR_LDFLAGS} ${AM_LDFLAGS} mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${AM_LDFLAGS}
mln_accu_tuple_SOURCES = mln_accu_tuple.cc mln_accu_tuple_SOURCES = mln_accu_tuple.cc
endif HAVE_BOOST_TUPLE endif HAVE_BOOST_TUPLE
endif HAVE_BOOST_PREPROCESSOR
# Starting a conditional unit test list. # Starting a conditional unit test list.
if HAVE_CFITSIO if HAVE_CFITSIO
......
Supports Markdown
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