From 33359bd51f8d5b4a76a2d51e1904ca2c3148dede Mon Sep 17 00:00:00 2001
From: akva <akva@e10b68d5-8a6e-419e-a041-bce267b0401d>
Date: Thu, 18 Apr 2013 13:22:18 +0000
Subject: [PATCH] fixed: detect ICC through the vendor flag rather the the
 compiler name

works better with mpi compiler wrappers

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@2335 e10b68d5-8a6e-419e-a041-bce267b0401d
---
 cmake/Modules/FindIFEM.cmake     | 10 +++++-----
 cmake/Modules/FindIFEMDeps.cmake |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/Modules/FindIFEM.cmake b/cmake/Modules/FindIFEM.cmake
index 7fd520d9..8a4dba41 100644
--- a/cmake/Modules/FindIFEM.cmake
+++ b/cmake/Modules/FindIFEM.cmake
@@ -75,14 +75,14 @@ SET(IFEM_INCLUDES ${IFEM_INCLUDES} ${IFEM_DEPINCLUDES})
 
 # Needed as we have templates using these flags
 ENABLE_LANGUAGE(CXX)
-IF(CMAKE_CXX_COMPILER MATCHES icpc)
-   SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
+IF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
+  SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
   SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
-ELSE(CMAKE_CXX_COMPILER MATCHES icpc)
+ELSE(CMAKE_CXX_COMPILER_ID MATCHES Intel)
   SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DUSE_CBLAS")
   SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DUSE_CBLAS")
+  FIND_PACKAGE(CBLAS REQUIRED)
   FIND_PACKAGE(LAPACK REQUIRED)
-  SET(IFEM_LIBRARIES ${IFEM_LIBRARIES} ${LAPACK_LIBRARIES})
-ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
+ENDIF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
 
 SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DReal=double")
diff --git a/cmake/Modules/FindIFEMDeps.cmake b/cmake/Modules/FindIFEMDeps.cmake
index 60e0f418..9aae554f 100644
--- a/cmake/Modules/FindIFEMDeps.cmake
+++ b/cmake/Modules/FindIFEMDeps.cmake
@@ -8,15 +8,15 @@ ENDIF(CMAKE_Fortran_COMPILER MATCHES ifort)
 
 # And C++ code
 ENABLE_LANGUAGE(CXX)
-IF(CMAKE_CXX_COMPILER MATCHES icpc)
+IF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
   SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
   SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
-ELSE(CMAKE_CXX_COMPILER MATCHES icpc)
+ELSE(CMAKE_CXX_COMPILER_ID MATCHES Intel)
   SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DUSE_CBLAS")
   SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DUSE_CBLAS")
   FIND_PACKAGE(CBLAS REQUIRED)
   FIND_PACKAGE(LAPACK REQUIRED)
-ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
+ENDIF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
 
 # Required dependences
 FIND_PACKAGE(GoTools REQUIRED)