Boost-Commit :

Date view	Thread view	Subject view	Author view

From: thomas.klimpel_at_[hidden]
Date: 2008-04-20 08:04:56

Author: klimpel
Date: 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
New Revision: 44613
URL: http://svn.boost.org/trac/boost/changeset/44613

Log:
Moved site/user specific handling of external libraries to numeric-bindings.jam

Added:
   sandbox/libs/numeric/bindings/numeric-bindings.jam (contents, props changed)
Text files modified:
   sandbox/libs/numeric/bindings/Jamfile.v2 | 2 ++
   sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 | 9 +--------
   sandbox/libs/numeric/bindings/atlas/Jamfile.v2 | 16 +++-------------
   sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 | 11 +----------
   sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 | 13 +------------
   5 files changed, 8 insertions(+), 43 deletions(-)

Modified: sandbox/libs/numeric/bindings/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/Jamfile.v2 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -5,6 +5,8 @@

project libs/numeric/bindings ;

+import numeric-bindings ;
+
build-project amos/test ;
build-project atlas ;
build-project blas/test ;

Modified: sandbox/libs/numeric/bindings/amos/test/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -3,17 +3,10 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-AMOS_PATH ?= /usr/lib ;
-AMOS_LIB ?= amos ;
-
-lib g2c ;
-lib amos_lib : g2c : <name>$(AMOS_LIB) <search>$(AMOS_PATH) ;
-
-
project libs/numeric/bindings/amos/test : requirements
<include>$(BOOST_ROOT)
<include>$(B_ROOT)
- <library>amos_lib ;
+ <library>/numeric-bindings//amos_lib ;

exe amos : amos.cpp ;

Modified: sandbox/libs/numeric/bindings/atlas/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/atlas/Jamfile.v2 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -3,22 +3,12 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-ATLAS_INCLUDE = /usr/local/lib/ATLAS/include ;
-ATLAS_PATH = /usr/lib ;
-#ATLAS_LIB = lapack_atlas cblas atlas g2c ;
-
-lib g2c ;
-lib atlas_lib : : <name>atlas <search>$(ATLAS_PATH) ;
-lib cblas_lib : : <name>cblas <search>$(ATLAS_PATH) ;
-lib lapack_atlas_lib : g2c : <name>lapack <search>$(ATLAS_PATH) ;
-
project libs/numeric/bindings/atlas : requirements
<include>$(BOOST_ROOT)
<include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library>lapack_atlas_lib
- <library>cblas_lib
- <library>atlas_lib ;
+ <library>/numeric-bindings//lapack_atlas_lib
+ <library>/numeric-bindings//cblas_lib
+ <library>/numeric-bindings//atlas_lib ;

import testing ;

Modified: sandbox/libs/numeric/bindings/blas/test/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -3,22 +3,13 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-BLAS_PATH ?= /usr/lib ;
-BLAS_LIB ?= blas ;
-
-lib g2c ;
-lib blas_lib : g2c : <name>$(BLAS_LIB) <search>$(BLAS_PATH) ;
-
-
project libs/numeric/bindings/blas/test : requirements
<include>$(BOOST_ROOT)
<include>$(BOOST)
- <library>blas_lib ;
+ <library>/numeric-bindings//blas_lib ;

import testing ;

-
-
#exe scal : scal.cpp ;
#exe blas1 : blas1.cpp ;
exe blas2 : blas2.cpp ;

Modified: sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -3,21 +3,10 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-LAPACK_PATH ?= /usr/lib ;
-LAPACK_LIB ?= lapack ;
-
-BLAS_PATH ?= /usr/lib ;
-BLAS_LIB ?= blas ;
-
-lib g2c ;
-lib blas_lib : g2c : <name>$(BLAS_LIB) <search>$(BLAS_PATH) ;
-lib lapack_lib : g2c : <name>$(LAPACK_LIB) <search>$(LAPACK_PATH) <use>blas_lib : : <library>blas_lib ;
-
-
project libs/numeric/bindings/lapack/test : requirements
<include>$(BOOST_ROOT)
<include>$(B_ROOT)
- <library>lapack_lib ;
+ <library>/numeric-bindings//lapack_lib ;

import testing ;

Added: sandbox/libs/numeric/bindings/numeric-bindings.jam
==============================================================================
--- (empty file)
+++ sandbox/libs/numeric/bindings/numeric-bindings.jam 2008-04-20 08:04:55 EDT (Sun, 20 Apr 2008)
@@ -0,0 +1,38 @@
+# Copyright Thomas Klimpel 2008.
+# Use, modification and distribution are subject to the
+# Boost Software License, Version 1.0. (See accompanying file
+# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# Make this module a project
+import project ;
+project.initialize $(__name__) ;
+project numeric-bindings ;
+
+AMOS_PATH ?= /usr/lib ;
+AMOS_LIB ?= amos ;
+
+ATLAS_INCLUDE ?= /usr/local/lib/ATLAS/include ;
+ATLAS_PATH ?= /usr/lib ;
+ATLAS_LIB ?= atlas ;
+CBLAS_LIB ?= cblas ;
+LAPACK_ATLAS_LIB ?= lapack ;
+
+BLAS_PATH ?= /usr/lib ;
+BLAS_LIB ?= blas ;
+
+LAPACK_PATH ?= /usr/lib ;
+LAPACK_LIB ?= lapack ;
+
+lib fortran_lib : : <name>g2c ;
+
+lib amos_lib : fortran_lib : <name>$(AMOS_LIB) <search>$(AMOS_PATH) ;
+
+lib atlas_lib : : <name>$(ATLAS_LIB) <search>$(ATLAS_PATH)
+ : : <include>$(ATLAS_INCLUDE) ;
+lib cblas_lib : : <name>$(CBLAS_LIB) <search>$(ATLAS_PATH)
+ : : <include>$(ATLAS_INCLUDE) ;
+lib lapack_atlas_lib : fortran_lib : <name>$(LAPACK_ATLAS_LIB) <search>$(ATLAS_PATH)
+ : : <include>$(ATLAS_INCLUDE) ;
+
+lib blas_lib : fortran_lib : <name>$(BLAS_LIB) <search>$(BLAS_PATH) ;
+lib lapack_lib : fortran_lib : <name>$(LAPACK_LIB) <search>$(LAPACK_PATH) <use>blas_lib : : <library>blas_lib ;

Date view	Thread view	Subject view	Author view

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