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

changed: find MKL in a better, portable way

Browse Source 
git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1351 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
akva 2011-12-19 15:52:30 +00:00 committed by Knut Morten Okstad
parent 554594ed2b
commit 6206f0cea6
2 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -16,7 +16,7 @@ ENDIF(CMAKE_Fortran_COMPILER MATCHES ifort)
ENABLE_LANGUAGE(CXX)
IF(CMAKE_CXX_COMPILER MATCHES icpc)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MKL")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MKL -mkl=sequential")
ELSE(CMAKE_CXX_COMPILER MATCHES icpc)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_CBLAS")
ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
@ -79,13 +79,6 @@ SET(INCLUDES
${PROJECT_SOURCE_DIR}/3rdparty/expreval
)
# MKL
IF(CMAKE_CXX_COMPILER MATCHES icpc)
FIND_PACKAGE(MKL REQUIRED)
SET(DEPLIBS ${DEPLIBS} ${MKL_LIBRARIES})
SET(INCLUDES ${INCLUDES} ${MKL_INCLUDES})
ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
IF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES AND "${ENABLE_SUPERLU_MT}")
FIND_PACKAGE(Threads REQUIRED)
SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})

54
cmake/Modules/FindMKL.cmake
View File

@ -1,54 +0,0 @@
if (MKL_INCLUDES AND MKL_LIBRARIES)
set(CBLAS_FIND_QUIETLY TRUE)
endif (MKL_INCLUDES AND MKL_LIBRARIES)
find_path(MKL_INCLUDES
NAMES
mkl_cblas.h
PATHS
$ENV{MKLDIR}/include
${INCLUDE_INSTALL_DIR}
)
MESSAGE("${MKL_INCLUDES}")
if(CMAKE_MINOR_VERSION GREATER 4)
if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
find_library(MKL_LIBRARIES
mkl_core
PATHS
$ENV{MKLLIB}
/opt/intel/mkl/*/lib/em64t
${LIB_INSTALL_DIR}
)
if(MKL_LIBRARIES)
set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential guide pthread)
endif(MKL_LIBRARIES)
else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
find_library(MKL_LIBRARIES
mkl_core
PATHS
$ENV{MKLLIB}
/opt/intel/mkl/*/lib/32
${LIB_INSTALL_DIR}
)
if(MKL_LIBRARIES)
set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential guide pthread)
endif(MKL_LIBRARIES)
endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
endif(CMAKE_MINOR_VERSION GREATER 4)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MKL DEFAULT_MSG
MKL_INCLUDES MKL_LIBRARIES)
mark_as_advanced(MKL_INCLUDES MKL_LIBRARIES)