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

Fixed "test" target.

Browse source
This commit is contained in:
Sergey Popov 2008-04-17 14:26:42 +00:00
parent ea1b9efdd7
commit d596b57e0b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -161,7 +161,8 @@ def CheckBoostLib(context, boost_lib, require_version = None):
backup = backup_env(env, ["CPPPATH", "LIBPATH", "LIBS"])
boost_headers = { "regex" : "regex/config.hpp",
"iostreams" : "iostreams/constants.hpp" }
"iostreams" : "iostreams/constants.hpp",
"unit_test_framework" : "test/unit_test.hpp" }
header_name = boost_headers.get(boost_lib, boost_lib + ".hpp")
libname = "boost_" + boost_lib + env.get("boost_suffix", "")
@ -366,8 +367,7 @@ env.Append(CPPPATH = ["#/src"])
boost_test_dyn_link = boost_auto_test = False
if 'test' in COMMAND_LINE_TARGETS:
boost_test_dyn_link = conf.CheckCXXHeader('boost/test/unit_test.hpp')
boost_auto_test = conf.CheckCXXHeader('boost/test/unit_test.hpp')
boost_test_dyn_link = boost_auto_test = conf.CheckBoost('unit_test_framework')
have_msgfmt = env.WhereIs("msgfmt")
if not have_msgfmt:

2
src/SConscript
View file

@ -262,7 +262,7 @@ test_sources = Split("""
tests/main.cpp
tests/test_util.cpp
""")
test_env.Program("test", test_sources + [libwesnoth_core, libwesnoth],
test_env.Program("../test", test_sources + [libwesnoth_core, libwesnoth],
CPPPATH = env["CPPPATH"] + ['/usr/include'],
LIBS = env["LIBS"] + ['boost_unit_test_framework'])