Subject: [Boost-commit] svn:boost r75970 - trunk/libs/graph/test
From: steven_at_[hidden]
Date: 2011-12-15 17:07:57
Author: steven_watanabe
Date: 2011-12-15 17:07:53 EST (Thu, 15 Dec 2011)
New Revision: 75970
URL: http://svn.boost.org/trac/boost/changeset/75970
Log:
Fix search for SDB and LEDA.
Text files modified:
trunk/libs/graph/test/Jamfile.v2 | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
Modified: trunk/libs/graph/test/Jamfile.v2
==============================================================================
--- trunk/libs/graph/test/Jamfile.v2 (original)
+++ trunk/libs/graph/test/Jamfile.v2 2011-12-15 17:07:53 EST (Thu, 15 Dec 2011)
@@ -8,6 +8,7 @@
# LEDA (also top level directory) at the command line of jam using -s
import modules ;
+import path ;
path-constant TEST_DIR : . ;
@@ -124,23 +125,25 @@
;
# Run SDB tests only when -sSDB= is set.
-if [ modules.peek : SDB ] != ""
+local SDB = [ modules.peek : SDB ] ;
+if $(SDB)
{
- local SDB_DEPENDENCIES =
- <include>$(SGB) <library-file>$(SGB)/libgb.a ;
+ local sdb-root = [ path.root [ path.make $(SDB) ] [ path.pwd ] ] ;
+ local sdb-lib = [ path.join $(sdb-root) libgb.a ] ;
- compile stanford_graph_cc.cpp
- $(SDB_DEPENDENCIES) ;
+ compile stanford_graph_cc.cpp :
+ <include>$(sdb-root) <library-file>$(sdb-lib) ;
}
# Run LEDA tests only when -sLEDA= is set.
-if [ modules.peek : LEDA ] != ""
+local LEDA = [ modules.peek : LEDA ] ;
+if $(LEDA)
{
- local LEDA_DEPENDENCIES =
- <include>$(LEDA)/incl
- <library-file>$(LEDA)/libG.a
- ;
-
- compile leda_graph_cc.cpp
- $(LEDA_DEPENDENCIES) ;
+ local leda-root = [ path.root [ path.make $(LEDA) ] [ path.pwd ] ] ;
+ local leda-include = [ path.join $(leda-root) incl ] ;
+ local leda-lib = [ path.join $(leda-root) libG.a ] ;
+
+ compile leda_graph_cc.cpp :
+ <include>$(leda-include)
+ <library-file>$(leda-lib) ;
}