If MKL is ON, setting MKL_DIR is enough when using Trilinos.

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index f5ab91d30cb06f366fe0dadfd71cb5d4eb4a706c..d82788e8042de94b4eb8a938f3839618e85f2ed9 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -21,6 +21,13 @@ if [ ! -z "${LAPACK_DIR}" ]; then
 fi
 
 if [ ${MKL} = "ON" ]; then
+  if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then 
+    TRILINOS_CONFOPTS=" \
+    ${TRILINOS_CONFOPTS} \
+    -D BLAS_LIBRARY_DIRS:STRING=${MKL_DIR} \
+    -D LAPACK_LIBRARY_DIRS:STRING=${MKL_DIR} \
+    "
+  fi
   TRILINOS_CONFOPTS=" \
   ${TRILINOS_CONFOPTS} \
   -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \