diff options
| author | Jakub Benda <jacob.benda@gmail.com> | 2018-11-18 20:00:14 (GMT) |
|---|---|---|
| committer | Jakub Benda <jacob.benda@gmail.com> | 2018-11-18 20:00:14 (GMT) |
| commit | 8b63265ea53dbd2e035a6b616ba0e82bfc0decc0 (patch) | |
| tree | 2f2c3aa7213412a1a7190bff00479ad8b2e03174 | |
| parent | ede1715c1d4f35e806e3dabddd09c39eeed9a628 (diff) | |
| download | CMake-8b63265ea53dbd2e035a6b616ba0e82bfc0decc0.zip CMake-8b63265ea53dbd2e035a6b616ba0e82bfc0decc0.tar.gz CMake-8b63265ea53dbd2e035a6b616ba0e82bfc0decc0.tar.bz2 | |
FindLAPACK: Unify internal variables related to MKL
Auxiliary internal variables related to MKL are now consistently
prefixed with LAPACK_mkl_ and unset at the end of the MKL section.
| -rw-r--r-- | Modules/FindLAPACK.cmake | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index ad1cd45..89a1430 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -178,7 +178,7 @@ if(BLAS_FOUND) #intel lapack if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") if (NOT WIN32) - set(LM "-lm") + set(LAPACK_mkl_LM "-lm") endif () if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED) if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED) @@ -188,9 +188,9 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") endif() if (BLA_VENDOR MATCHES "_64ilp") - set(BLAS_mkl_ILP_MODE "ilp64") + set(LAPACK_mkl_ILP_MODE "ilp64") else () - set(BLAS_mkl_ILP_MODE "lp64") + set(LAPACK_mkl_ILP_MODE "lp64") endif () set(LAPACK_SEARCH_LIBS "") @@ -207,7 +207,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") list(APPEND LAPACK_SEARCH_LIBS "mkl_intel_c") list(APPEND LAPACK_SEARCH_LIBS - "mkl_lapack95_${BLAS_mkl_ILP_MODE}") + "mkl_lapack95_${LAPACK_mkl_ILP_MODE}") else() set(LAPACK_mkl_SEARCH_SYMBOL "cheev") set(_LIBRARIES LAPACK_LIBRARIES) @@ -222,7 +222,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") if (NOT ${_LIBRARIES}) check_lapack_libraries( ${_LIBRARIES} - BLAS + LAPACK ${LAPACK_mkl_SEARCH_SYMBOL} "" "" @@ -235,17 +235,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") if (NOT ${_LIBRARIES}) check_lapack_libraries( ${_LIBRARIES} - BLAS + LAPACK ${LAPACK_mkl_SEARCH_SYMBOL} "" "${IT}" "${_BLAS_LIBRARIES}" - "${CMAKE_THREAD_LIBS_INIT};${LM}" + "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM}" ) endif () endforeach () - unset(BLAS_mkl_ILP_MODE) + unset(LAPACK_mkl_ILP_MODE) + unset(LAPACK_mkl_SEARCH_SYMBOL) + unset(LAPACK_mkl_LM) endif () endif() |