Now tested and working with boost test 1.33.1 & 1.34.1

This commit is contained in:
Pauli Nieminen 2008-01-13 23:23:49 +00:00
parent 39e6c23a57
commit 31149382f9
3 changed files with 13 additions and 3 deletions

View file

@ -899,6 +899,12 @@ LIBS="$BOOST_IOSTREAMS_LIBS $LIBS"
if test "x$tests" = "xyes"; then
BOOST_TEST
# workaround for broken 1.33.1 debian packet
if test x"$BOOST_UNIT_TEST_FRAMEWORK_LIBS" = x; then
BOOST_UNIT_TEST_FRAMEWORK_LIBS="-lboost_unit_test_framework"
# BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS="-L/usr/lib -R/usr/lib"
fi
LDFLAGS="$BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS $LDFLAGS"
LIBS="$BOOST_UNIT_TEST_FRAMEWORK_LIBS $LIBS"
@ -928,6 +934,8 @@ if test "x$tests" = "xyes"; then
AC_MSG_CHECKING([for boost auto test not in core])
m4_pattern_allow([^BOOST_AUTO_TEST_CASE$])
AC_LINK_IFELSE([AC_LANG_SOURCE([
#define BOOST_AUTO_TEST_MAIN
#include <boost/test/auto_unit_test.hpp>

View file

@ -481,9 +481,9 @@ if BOOST_TEST_DYN_LINK
endif
if BOOST_AUTO_TEST
CXXFLAGS += -DBOOST_AUTO_TEST_MAIN
CXXFLAGS += -DWESNOTH_BOOST_AUTO_TEST_MAIN
else
CXXFLAGS += -DBOOST_TEST_MAIN
CXXFLAGS += -DWESNOTH_BOOST_TEST_MAIN
endif
CXXLD = $(LDPREFIX) $(CXX)

View file

@ -11,9 +11,11 @@
See the COPYING file for more details.
*/
#ifdef BOOST_AUTO_TEST_MAIN
#ifdef WESNOTH_BOOST_AUTO_TEST_MAIN
#define BOOST_AUTO_TEST_MAIN
#include <boost/test/auto_unit_test.hpp>
#else
#define BOOST_TEST_MAIN
#include <boost/test/unit_test.hpp>
#endif