sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1858

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-22 09:21:56 -07:00
parent 95d5b73d86
commit 23878cf03e
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -1867,10 +1867,9 @@ if not HELP_REQUESTED:
SConscript('fonts/build.py') SConscript('fonts/build.py')
# build C++ tests # build C++ tests
if env['CPP_TESTS']:
SConscript('tests/cpp_tests/build.py') SConscript('tests/cpp_tests/build.py')
if env['SVG_RENDERER']: if env['CPP_TESTS'] and env['SVG_RENDERER']:
SConscript('tests/cpp_tests/svg_renderer_tests/build.py') SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
if env['BENCHMARK']: if env['BENCHMARK']:

21
tests/cpp_tests/build.py
View file

@ -6,18 +6,19 @@ Import ('env')
test_env = env.Clone() test_env = env.Clone()
test_env['LIBS'] = copy(env['LIBMAPNIK_LIBS']) if not env['CPP_TESTS']:
test_env.AppendUnique(LIBS='mapnik') for cpp_test_bin in glob.glob('*-bin'):
test_env.AppendUnique(LIBS='sqlite3') os.unlink(cpp_test_bin)
test_env.AppendUnique(CXXFLAGS='-g') else:
test_env['LIBS'] = copy(env['LIBMAPNIK_LIBS'])
test_env['CXXFLAGS'] = copy(test_env['LIBMAPNIK_CXXFLAGS']) test_env.AppendUnique(LIBS='mapnik')
test_env.AppendUnique(LIBS='sqlite3')
if test_env['HAS_CAIRO']: test_env.AppendUnique(CXXFLAGS='-g')
test_env['CXXFLAGS'] = copy(test_env['LIBMAPNIK_CXXFLAGS'])
if test_env['HAS_CAIRO']:
test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS']) test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS'])
test_env.Append(CPPDEFINES = '-DHAVE_CAIRO') test_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
for cpp_test in glob.glob('*_test.cpp'):
for cpp_test in glob.glob('*_test.cpp'):
name = cpp_test.replace('.cpp','-bin') name = cpp_test.replace('.cpp','-bin')
source_files = [cpp_test] source_files = [cpp_test]
test_program = None test_program = None