From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Wed, 7 Oct 2015 20:05:59 +0000 (-0500)
Subject: If MKL is ON, setting MKL_DIR is enough when using Trilinos.
X-Git-Tag: v0.7~12^2~1^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e21658d7cd5ab205ac3f7d15001e6c9cd22b23b;p=candi.git

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 f5ab91d..d82788e 100644
--- 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' \