From 210a280daf5c071886789a4f7bf45eb6d49c31c3 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 26 Jan 2011 17:58:01 +0100
Subject: update FindMKL to match the default installation behavior of MKL 11

---
 bench/btl/cmake/FindMKL.cmake | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'bench/btl')

diff --git a/bench/btl/cmake/FindMKL.cmake b/bench/btl/cmake/FindMKL.cmake
index 7cfd10dfb..cc2ab38e2 100644
--- a/bench/btl/cmake/FindMKL.cmake
+++ b/bench/btl/cmake/FindMKL.cmake
@@ -20,12 +20,23 @@ find_library(MKL_LIBRARIES
   PATHS
   $ENV{MKLLIB}
   /opt/intel/mkl/*/lib/em64t
+  /opt/intel/Compiler/*/*/mkl/lib/em64t
   ${LIB_INSTALL_DIR}
 )
 
-if(MKL_LIBRARIES)
-set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential guide pthread)
-endif(MKL_LIBRARIES)
+find_library(MKL_GUIDE
+  guide
+  PATHS
+  $ENV{MKLLIB}
+  /opt/intel/mkl/*/lib/em64t
+  /opt/intel/Compiler/*/*/mkl/lib/em64t
+  /opt/intel/Compiler/*/*/lib/intel64
+  ${LIB_INSTALL_DIR}
+)
+
+if(MKL_LIBRARIES AND MKL_GUIDE)
+  set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential ${MKL_GUIDE} pthread)
+endif()
 
 else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
 
@@ -34,12 +45,23 @@ find_library(MKL_LIBRARIES
   PATHS
   $ENV{MKLLIB}
   /opt/intel/mkl/*/lib/32
+  /opt/intel/Compiler/*/*/mkl/lib/32
+  ${LIB_INSTALL_DIR}
+)
+
+find_library(MKL_GUIDE
+  guide
+  PATHS
+  $ENV{MKLLIB}
+  /opt/intel/mkl/*/lib/32
+  /opt/intel/Compiler/*/*/mkl/lib/32
+  /opt/intel/Compiler/*/*/lib/intel32
   ${LIB_INSTALL_DIR}
 )
 
-if(MKL_LIBRARIES)
-set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential guide pthread)
-endif(MKL_LIBRARIES)
+if(MKL_LIBRARIES AND MKL_GUIDE)
+  set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential ${MKL_GUIDE} pthread)
+endif()
 
 endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
 
-- 
cgit v1.2.3