X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=1d38d62cf60831f3cac07372855cbf0ea796d0d3;hb=1b1d76302a5d61e918ef71f1c8e11f80ac1262e2;hp=7956bc3d8485930fb72487d365b926fcc0ca3bb7;hpb=6e75040e8e312ad6f91fb979c2ad71dbb4b53bb5;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 7956bc3..1d38d62 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -52,6 +52,7 @@ SCONS_TOOLS = [ "CopyToDir", "InstallIncludes", "ProgramNoScan", + "CompileCheck", ] opts = None @@ -253,7 +254,7 @@ def MakeEnvironment(): # CPPDEFINES = [ '_GLIBCXX_DEBUG' ], env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ], CPPDEFINES = [ 'SENF_DEBUG' ], - LINKFLAGS = [ '-g' ]) + LINKFLAGS = [ '-g', '-rdynamic' ]) env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ], LIBS = [ '$EXTRA_LIBS' ], @@ -304,13 +305,17 @@ def GlobalTargets(env): def LibPath(lib): return '${LOCALLIBDIR}/${LIBPREFIX}%s${LIBADDSUFFIX}${LIBSUFFIX}' % lib def Test(env, sources, LIBS = [], OBJECTS = []): - test = env.BoostUnitTests( + test = [ env.BoostUnitTests( target = 'test', objects = [], test_sources = sources, LIBS = [ x + '$LIBADDSUFFIX' for x in LIBS ], OBJECTS = OBJECTS, - DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) + DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ] + compileTestSources = [ src for src in sources + if 'COMPILE_CHECK' in file(src).read() ] + if compileTestSources: + test.extend(env.CompileCheck(source = compileTestSources)) env.Alias('all_tests', test) env.Alias(env.File('test'), test) @@ -351,13 +356,17 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = [], no_includ objects += env.Object(obsources) if testSources: - test = env.BoostUnitTests( + test = [ env.BoostUnitTests( target = 'test', objects = objects, test_sources = testSources, LIBS = [ x + '$LIBADDSUFFIX' for x in LIBS ], OBJECTS = OBJECTS, - DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) + DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ] + compileTestSources = [ src for src in testSources + if 'COMPILE_CHECK' in file(src).read() ] + if compileTestSources: + test.extend(env.CompileCheck(source = compileTestSources)) env.Alias('all_tests', test) # Hmm ... here I'd like to use an Alias instead of a file # however the alias does not seem to live in the subdirectory