OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: detect ICC through the vendor flag rather the the compiler name

Browse Source 
works better with mpi compiler wrappers

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@2335 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
akva
2013-04-18 13:22:18 +00:00
committed by Knut Morten Okstad
parent df3031b23c
commit 33359bd51f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Modules/FindIFEM.cmake
View File

@@ -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")

6
cmake/Modules/FindIFEMDeps.cmake
View File

@@ -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)