fixup compile on osx and remove tabs in svg tests
This commit is contained in:
parent
789ff19824
commit
1b535430cb
2 changed files with 11 additions and 8 deletions
|
@ -5,16 +5,18 @@ Import ('env')
|
|||
|
||||
headers = env['CPPPATH']
|
||||
|
||||
boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
|
||||
boost_system = 'boost_system%s' % env['BOOST_APPEND']
|
||||
filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
|
||||
system = 'boost_system%s' % env['BOOST_APPEND']
|
||||
regex = 'boost_regex%s' % env['BOOST_APPEND']
|
||||
|
||||
libraries = [boost_system, boost_filesystem, 'mapnik2']
|
||||
libraries = [filesystem, 'mapnik2']
|
||||
|
||||
if env['PLATFORM'] == 'Darwin':
|
||||
libraries.append(env['ICU_LIB_NAME'])
|
||||
libraries.append(regex)
|
||||
|
||||
if env['HAS_BOOST_SYSTEM']:
|
||||
libraries.append(boost_system)
|
||||
libraries.append(system)
|
||||
|
||||
for cpp_test in glob.glob('*_test.cpp'):
|
||||
env.Program(cpp_test.replace('.cpp',''), [cpp_test], CPPPATH=headers, LIBS=libraries)
|
|
@ -23,12 +23,13 @@ BOOST_AUTO_TEST_CASE(compile_test_case)
|
|||
|
||||
try
|
||||
{
|
||||
std::stringstream output_stream;
|
||||
svg_renderer<std::stringstream> renderer(map, output_stream);
|
||||
renderer.apply();
|
||||
std::stringstream output_stream;
|
||||
svg_renderer<std::stringstream> renderer(map, output_stream);
|
||||
renderer.apply();
|
||||
std::clog << output_stream.str() << "\n";
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
BOOST_FAIL("Empty implementation throws exception.");
|
||||
BOOST_FAIL("Empty implementation throws exception.");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue