env['BOOST_VARIANT'] = "-" + env['BOOST_TOOLSET'] + runtime
env['BOOSTTESTLIB'] = 'libboost_unit_test_framework' + env['BOOST_VARIANT']
+ env['BOOSTREGEXLIB'] = 'libboost_regex' + env['BOOST_VARIANT']
env.Append(LIBPATH = [ '$BOOST_LIBDIR' ],
CPPPATH = [ '$BOOST_INCLUDES' ])
if type(sources) == type(()):
testSources = sources[1]
sources = sources[0]
+ if type(sources) is not type([]):
+ sources = [ sources ]
objects = None
if sources:
- objects = env.Object(sources)
+ objects = env.Object([
+ source
+ for source in sources
+ if not str(source).endswith('.o') ]) + [
+ source
+ for source in sources
+ if str(source).endswith('.o') ]
+
if testSources:
test = env.BoostUnitTests(
target = 'test',
- source = sources,
- test_source = testSources,
+ objects = objects,
+ test_sources = testSources,
LIBS = LIBS,
OBJECTS = OBJECTS,
DEPENDS = [ env.File(LibPath(x)) for x in LIBS ])