From de2763b68431bcf2486468f6d4d331ce8d43d42a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Mon, 2 Nov 2015 20:02:50 +0100 Subject: [PATCH] deal.II: only set confopt if package dir is present --- deal.II-toolchain/packages/dealii.package | 65 ++++++++++++++--------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 72af3af..cdf0d52 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -11,37 +11,54 @@ CONFOPTS=" \ ${DEAL_CONFOPTS} \ " -CONFOPTS="${CONFOPTS} \ --D ARPACK_DIR=${ARPACK_DIR}\ -" +######################################################################### +if [ ! -z "${ARPACK_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D ARPACK_DIR=${ARPACK_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D METIS_DIR=${METIS_DIR} \ -" +if [ ! -z "${METIS_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D METIS_DIR=${METIS_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D MUMPS_DIR=${MUMPS_DIR} \ -" +if [ ! -z "${MUMPS_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D MUMPS_DIR=${MUMPS_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D P4EST_DIR=${P4EST_DIR} \ -" +if [ ! -z "${P4EST_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D P4EST_DIR=${P4EST_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D HDF5_DIR=${HDF5_DIR} \ -" +if [ ! -z "${HDF5_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D HDF5_DIR=${HDF5_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D TRILINOS_DIR=${TRILINOS_DIR} \ -" +if [ ! -z "${TRILINOS_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D TRILINOS_DIR=${TRILINOS_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D PETSC_DIR=${PETSC_DIR} \ -" +if [ ! -z "${PETSC_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D PETSC_DIR=${PETSC_DIR}" +fi -CONFOPTS="${CONFOPTS} \ --D SLEPC_DIR=${SLEPC_DIR} \ -" +if [ ! -z "${SLEPC_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D SLEPC_DIR=${SLEPC_DIR}" +fi # ********************************************************************************** package_specific_conf() { -- 2.39.5