From 735363c47d0d35f8a90479ea4ba1f53e164fdb22 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 20 May 2013 11:08:40 -0700 Subject: [PATCH] Revert "scons: use VariantDir to avoid 'Two environments with different actions' error when building both cpp_tests and with PLUGIN_LINKING=static" This reverts commit 2393453765cc9c96de0c0c5bce98984b5ef09f32. --- tests/cpp_tests/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/cpp_tests/build.py b/tests/cpp_tests/build.py index 8590b29d8..d47c167bc 100644 --- a/tests/cpp_tests/build.py +++ b/tests/cpp_tests/build.py @@ -35,10 +35,9 @@ for cpp_test in glob.glob('*_test.cpp'): agg_env['CPPPATH'] = ['#deps/agg/include',env['BOOST_INCLUDES']] test_program = agg_env.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS']) else: - VariantDir('build','../../plugins/input/csv/') test_env_local = test_env.Clone() 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']) Depends(test_program, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) # build locally if installing