Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r62540 - in sandbox/numpy: . libs/python/numpy/src libs/python/numpy/test
From: talljimbo_at_[hidden]
Date: 2010-06-07 21:45:00


Author: jbosch
Date: 2010-06-07 21:44:59 EDT (Mon, 07 Jun 2010)
New Revision: 62540
URL: http://svn.boost.org/trac/boost/changeset/62540

Log:
boost.python numpy - build system separates debug and standard builds
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/SConstruct | 15 +++++++++++----
   1 files changed, 11 insertions(+), 4 deletions(-)

Modified: sandbox/numpy/SConstruct
==============================================================================
--- sandbox/numpy/SConstruct (original)
+++ sandbox/numpy/SConstruct 2010-06-07 21:44:59 EDT (Mon, 07 Jun 2010)
@@ -5,13 +5,20 @@
 bp_numpy_env.SetupPackages(["boost.python","numpy"])
 bp_numpy_env.Append(CPPPATH = "#")
 
+if ARGUMENTS.get("debug", 0):
+ build_dir = "build.debug"
+else:
+ build_dir = "build"
+Export("build_dir")
+
 Export("bp_numpy_env")
-lib = SConscript("libs/python/numpy/src/SConscript")
-libpath = os.path.abspath("libs/python/numpy/src")
+lib = SConscript("libs/python/numpy/src/SConscript",
+ variant_dir="%s/python/numpy/src" % build_dir, duplicate=False)
+libpath = os.path.abspath("%s/python/numpy/src" % build_dir)
 if os.environ.has_key("LD_LIBRARY_PATH"):
     bp_numpy_env["ENV"]["LD_LIBRARY_PATH"] = "%s:%s" % (libpath, os.environ["LD_LIBRARY_PATH"])
 else:
     bp_numpy_env["ENV"]["LD_LIBRARY_PATH"] = libpath
-bp_numpy_env.Append(LIBPATH="#libs/python/numpy/src")
+bp_numpy_env.Append(LIBPATH=libpath)
 
-SConscript("libs/python/numpy/test/SConscript")
+SConscript("libs/python/numpy/test/SConscript", variant_dir="%s/python/numpy/test" % build_dir)


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk