Changeset 15337

Timestamp:

06/26/13 16:22:53 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: new mkl library on pleiades required other flags

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -871 +871 @@
                 HAVE_MKL=yes
                 MKLINCL=""
-                MKLLIB=-L"$MKL_ROOT -lmkl -lmkl_lapack -lmkl_scalapack_ilp64   -lmkl_blacs_sgimpt_ilp64 -lguide  -lpthread"
+                if test x$VENDOR = xintel-pleiades; then
+                 MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread"
+                else
+                 MKLLIB=-L"$MKL_ROOT -lmkl -lmkl_lapack -lmkl_scalapack_ilp64 -lmkl_blacs_sgimpt_ilp64 -lguide -lpthread"
+                fi
                 AC_DEFINE([_HAVE_MKL_],[1],[with mkl in ISSM src])
                 AC_SUBST([MKLLIB])