From a300f7cdd077c544bdb1fa547a60bd227d558bee Mon Sep 17 00:00:00 2001 From: Jim Bosch Date: Fri, 7 Jan 2011 23:39:45 +0000 Subject: [PATCH] boost.python.numpy - updates to build system, added some svn:ignores --- site_scons/scons_tools.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/site_scons/scons_tools.py b/site_scons/scons_tools.py index 897de00b..762b9a9a 100755 --- a/site_scons/scons_tools.py +++ b/site_scons/scons_tools.py @@ -234,8 +234,14 @@ def SetupPackages(env, packages): def MakeEnvironment(): env = scons.Environment(tools = ["default", "doxygen"]) - env.Append(CPPPATH="#include") - env.Append(LIBPATH="#lib") + if scons.ARGUMENTS.has_key('LIBPATH'): + env.Append(LIBPATH=[os.path.abspath(s) for s in scons.ARGUMENTS['LIBPATH'].split(":")]) + if scons.ARGUMENTS.has_key('RPATH'): + env.Append(RPATH=[os.path.abspath(s) for s in scons.ARGUMENTS['RPATH'].split(":")]) + if scons.ARGUMENTS.has_key('CPPPATH'): + env.Append(CPPPATH=[os.path.abspath(s) for s in scons.ARGUMENTS['CPPPATH'].split(":")]) + env.Append(CPPPATH=["#include"]) + env.Append(LIBPATH=["#lib"]) env.AddMethod(RecursiveInstall, "RecursiveInstall") env.AddMethod(SetupPackages, "SetupPackages") env.AddMethod(BoostUnitTest, "BoostUnitTest")