[cig-commits] commit: Add rpath stuff
Mercurial
hg at geodynamics.org
Fri Oct 21 17:03:35 PDT 2011
changeset: 40:2aeeb10f27c0
user: Walter Landry <wlandry at caltech.edu>
date: Fri Oct 21 16:59:27 2011 -0700
files: wscript
description:
Add rpath stuff
diff -r 7efa748c965e -r 2aeeb10f27c0 wscript
--- a/wscript Fri Oct 21 16:35:44 2011 -0700
+++ b/wscript Fri Oct 21 16:59:27 2011 -0700
@@ -56,6 +56,7 @@ def configure(cnf):
cnf.check_cc(header_name='proj_api.h',uselib_store='proj',
includes=[cnf.options.proj_incdir],
libpath=[cnf.options.proj_libdir],
+ rpath=[cnf.options.proj_libdir],
lib='proj')
# Find GMT
@@ -74,6 +75,7 @@ def configure(cnf):
cnf.check_cc(msg="Checking for gmt.h in '" + inc + "'",
header_name='gmt.h', includes=inc,
libpath=[cnf.options.gmt_libdir],
+ rpath=[cnf.options.gmt_libdir],
lib=['gmt','netcdf'], uselib_store='gmt')
except cnf.errors.ConfigurationError:
pass
@@ -118,6 +120,7 @@ def configure(cnf):
cnf.check_fc(msg="Checking for fftw",
includes=[inc], fragment=frag, uselib_store='fftw',
libpath=[cnf.options.fftw_libdir],
+ rpath=[cnf.options.fftw_libdir],
lib=['fftw3f','fftw3f_threads'], define_name="FFTW3")
# Find MKL
elif not cnf.options.use_ctfft:
@@ -135,6 +138,7 @@ def configure(cnf):
uselib_store='imkl',
includes=[cnf.options.mkl_incdir],
libpath=[cnf.options.mkl_libdir],
+ rpath=[cnf.options.mkl_libdir],
use='openmp', define_name='IMKL_FFT')
cnf.write_config_header('config.h')
More information about the CIG-COMMITS
mailing list