0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed boost.test configuration not to mess with other targets

Browse source
This commit is contained in:
Pauli Nieminen 2008-01-15 09:45:10 +00:00
parent febda96e03
commit 7590703aa9
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -905,9 +905,6 @@ if test "x$tests" = "xyes"; then
# 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"
AC_LANG([C++])
AC_MSG_CHECKING([for dynamic linked boost test])

10
src/Makefile.am
View file

@ -112,8 +112,8 @@ wesnoth_source = \
#############################################################################
wesnoth_SOURCES = \
$(wesnoth_source) \
game.cpp
game.cpp \
$(wesnoth_source)
wesnoth_LDADD = $(THELIBS) libwesnoth.a
wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
@ -202,11 +202,11 @@ cutter_DEPENDENCIES=libwesnoth-core.a
#############################################################################
test_SOURCES = \
$(wesnoth_source) \
tests/main.cpp \
tests/test_util.cpp
tests/test_util.cpp \
$(wesnoth_source)
test_LDADD = -lboost_unit_test_framework $(THELIBS) libwesnoth.a
test_LDADD = $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) libwesnoth.a
test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
#############################################################################