From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Tue, 10 Nov 2015 19:03:34 +0000 (+0100)
Subject: deal.II: more verbose output for specific configurations
X-Git-Tag: v0.8.1~12
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ad594b6006fa7967dfe218d4c0979e670adcccd;p=candi.git

deal.II: more verbose output for specific configurations
---

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 8c5f978..07869a0 100644
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -32,6 +32,7 @@ ${DEAL_CONFOPTS} \
 # Add additional packages, if present
 
 if [ ! -z "${ARPACK_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with ARPACK"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_ARPACK:BOOL=ON \
@@ -39,6 +40,7 @@ if [ ! -z "${ARPACK_DIR}" ]; then
 fi
 
 if [ ! -z "${METIS_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with METIS"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_METIS:BOOL=ON \
@@ -46,12 +48,14 @@ if [ ! -z "${METIS_DIR}" ]; then
 fi
 
 if [ ! -z "${MUMPS_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with MUMPS"
     CONFOPTS="\
         ${CONFOPTS} \
         -D MUMPS_DIR=${MUMPS_DIR}"
 fi
 
 if [ ! -z "${P4EST_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with P4EST"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_P4EST:BOOL=ON \
@@ -59,6 +63,7 @@ if [ ! -z "${P4EST_DIR}" ]; then
 fi
 
 if [ ! -z "${HDF5_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with HDF5"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_HDF5:BOOL=ON \
@@ -66,6 +71,7 @@ if [ ! -z "${HDF5_DIR}" ]; then
 fi
 
 if [ ! -z "${TRILINOS_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with TRILINOS"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_TRILINOS:BOOL=ON \
@@ -73,6 +79,7 @@ if [ ! -z "${TRILINOS_DIR}" ]; then
 fi
 
 if [ ! -z "${PETSC_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with PETSC"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_PETSC:BOOL=ON \
@@ -80,6 +87,7 @@ if [ ! -z "${PETSC_DIR}" ]; then
 fi
 
 if [ ! -z "${SLEPC_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with SLEPC"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_SLEPC:BOOL=ON \
@@ -87,11 +95,13 @@ if [ ! -z "${SLEPC_DIR}" ]; then
 fi
 
 if [ ! -z "${OPENCASCADE_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with OPENCASCADE"
     CONFOPTS="\
         ${CONFOPTS} \
         -D DEAL_II_WITH_OPENCASCADE:BOOL=ON"
 fi
 
+read
 
 ################################################################################
 ################################################################################
diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package
index e07a24a..2054b1c 100644
--- a/deal.II-toolchain/packages/petsc.package
+++ b/deal.II-toolchain/packages/petsc.package
@@ -41,6 +41,8 @@ if [ ! -z "$F90" ]; then
 fi
 
 if [ ! -z "${MKL_DIR}" ]; then
+    cecho ${INFO} "petsc: configuration with MKL"
+    cecho ${INFO} "petsc: configuration with blas-lapack-dir=${MKL_DIR}"
     CONFOPTS="${CONFOPTS} --with-blas-lapack-dir=${MKL_DIR}"
 fi
 
diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index 5e7e9ee..027874f 100644
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -41,12 +41,14 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 
 # Set blas and lapack directories
 if [ ! -z "${BLAS_DIR}" ]; then
+    cecho ${INFO} "trilinos: configuration with BLAS_DIR=${BLAS_DIR}"
     CONFOPTS="\
         ${CONFOPTS} \
         -D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR}"
 fi
 
 if [ ! -z "${LAPACK_DIR}" ]; then
+    cecho ${INFO} "trilinos: configuration with LAPACK_DIR=${LAPACK_DIR}"
     CONFOPTS="
         ${CONFOPTS} \
         -D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_DIR}"
@@ -54,7 +56,10 @@ fi
 
 # Set intel MKL options
 if [ ${MKL} = "ON" ]; then
-    if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then 
+    cecho ${INFO} "trilinos: configuration with MKL"
+    if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then
+        cecho ${INFO} "trilinos: configuration with BLAS_DIR=${MKL_DIR}"
+        cecho ${INFO} "trilinos: configuration with LAPACK_DIR=${MKL_DIR}"
         CONFOPTS=" \
             ${CONFOPTS} \
             -D BLAS_LIBRARY_DIRS:STRING=${MKL_DIR} \
@@ -93,7 +98,8 @@ CONFOPTS="${CONFOPTS} \
           -D Trilinos_EXTRA_LINK_FLAGS:STRING=-lgfortran"
 
 # Add ParMETIS, if present
-if [ ! -z "${PARMETIS_DIR}" ] && [ ! -z "${ParMETIS}" ] && [ ${ParMETIS} = "ON" ]; then
+if [ ! -z "${PARMETIS_DIR}" ] && [ ! -z "${ParMETIS}" ]; then
+    cecho ${INFO} "trilinos: configuration with ParMETIS"
     CONFOPTS="\
         ${CONFOPTS} \
         -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \
@@ -102,7 +108,8 @@ if [ ! -z "${PARMETIS_DIR}" ] && [ ! -z "${ParMETIS}" ] && [ ${ParMETIS} = "ON"
 fi
 
 # Add SuperLU_dist, if present
-if [ ! -z "${SUPERLU_DIR}" ] && [ ! -z "${SuperLUDist}" ] && [ ${SuperLUDist} = "ON" ]; then
+if [ ! -z "${SUPERLU_DIR}" ] && [ ! -z "${SuperLUDist}" ]; then
+    cecho ${INFO} "trilinos: configuration with SuperLU_dist"
     CONFOPTS="\
         ${CONFOPTS} \
           -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \