diff options
| author | bmundim <bmundim@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-07-23 04:56:10 +0000 |
|---|---|---|
| committer | bmundim <bmundim@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-07-23 04:56:10 +0000 |
| commit | d81f0b2017b1340a7445a09967fd253da72a6a90 (patch) | |
| tree | 7f16bd2690523502a4087a295fad544c4ed4f64f | |
| parent | 144e900ee0a95115f9845c2cc33a65fa401fd1d1 (diff) | |
Introduce HDF5_INSTALL_DIR configuration option.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@40 fb53df36-e548-4a1e-8150-ab98cbd5e786
| -rw-r--r-- | HDF5.sh | 12 | ||||
| -rw-r--r-- | configuration.ccl | 2 |
2 files changed, 12 insertions, 2 deletions
@@ -89,7 +89,17 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then NAME=hdf5-1.8.6 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${HDF5_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "HDF5 install directory, HDF5_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "HDF5 install directory, HDF5_INSTALL_DIR, selected. Installing HDF5 at ${HDF5_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${HDF5_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} HDF5_DIR=${INSTALL_DIR} diff --git a/configuration.ccl b/configuration.ccl index 9660de8..8200b26 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,7 +4,7 @@ PROVIDES HDF5 { SCRIPT HDF5.sh LANG bash - OPTIONS HDF5 HDF5_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR + OPTIONS HDF5 HDF5_DIR HDF5_INSTALL_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR } REQUIRES HDF5 |