Subject: [Boost-commit] svn:boost r67765 - in sandbox/numpy: . libs/python/numpy/src libs/python/numpy/test site_scons
From: talljimbo_at_[hidden]
Date: 2011-01-07 18:39:46
Author: jbosch
Date: 2011-01-07 18:39:45 EST (Fri, 07 Jan 2011)
New Revision: 67765
URL: http://svn.boost.org/trac/boost/changeset/67765
Log:
boost.python.numpy - updates to build system, added some svn:ignores
Properties modified:
sandbox/numpy/ (props changed)
sandbox/numpy/libs/python/numpy/src/ (props changed)
sandbox/numpy/libs/python/numpy/test/ (props changed)
Text files modified:
sandbox/numpy/site_scons/scons_tools.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Modified: sandbox/numpy/site_scons/scons_tools.py
==============================================================================
--- sandbox/numpy/site_scons/scons_tools.py (original)
+++ sandbox/numpy/site_scons/scons_tools.py 2011-01-07 18:39:45 EST (Fri, 07 Jan 2011)
@@ -234,8 +234,14 @@
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")