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

Revert "scons: use VariantDir to avoid 'Two environments with different actions' error when building both cpp_tests and with PLUGIN_LINKING=static"

Browse source 
This reverts commit 2393453765.
This commit is contained in:
Dane Springmeyer 2013-05-20 11:08:40 -07:00
parent 15e059a9ac
commit 735363c47d
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/cpp_tests/build.py
View file

@ -35,10 +35,9 @@ for cpp_test in glob.glob('*_test.cpp'):
agg_env['CPPPATH'] = ['#deps/agg/include',env['BOOST_INCLUDES']] agg_env['CPPPATH'] = ['#deps/agg/include',env['BOOST_INCLUDES']]
test_program = agg_env.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS']) test_program = agg_env.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
else: else:
VariantDir('build','../../plugins/input/csv/')
test_env_local = test_env.Clone() test_env_local = test_env.Clone()
if 'csv_parse' in cpp_test: if 'csv_parse' in cpp_test:
source_files += glob.glob('build' + '*.cpp') source_files += glob.glob('../../plugins/input/csv/' + '*.cpp')
test_program = test_env_local.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS']) test_program = test_env_local.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
Depends(test_program, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) Depends(test_program, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
# build locally if installing # build locally if installing