summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-11-06 16:29:24 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-11-06 16:29:42 (GMT)
commitc752edfcb39e53edb972374eff795f027f85b4c7 (patch)
tree54c6eaf68ca59d36aed621c9a69069edbeee38e6
parent44760059fcbd9e84bd560c2be9ea00c5483da8f2 (diff)
parentf1a3e4eca8310e8357a1fe0c0bfe75021952b874 (diff)
downloadCMake-c752edfcb39e53edb972374eff795f027f85b4c7.zip
CMake-c752edfcb39e53edb972374eff795f027f85b4c7.tar.gz
CMake-c752edfcb39e53edb972374eff795f027f85b4c7.tar.bz2
Merge topic 'blaslapack95'
f1a3e4eca8 FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapper 970b18e9a5 FindBLAS: Correct symbol searched in BLAS95 wrapper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2560
-rw-r--r--Modules/FindBLAS.cmake2
-rw-r--r--Modules/FindLAPACK.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 48cd207..d150826 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -223,7 +223,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
set(BLAS_SEARCH_LIBS "")
if(BLA_F95)
- set(BLAS_mkl_SEARCH_SYMBOL SGEMM)
+ set(BLAS_mkl_SEARCH_SYMBOL sgemm_f95)
set(_LIBRARIES BLAS95_LIBRARIES)
if (WIN32)
if (BLA_STATIC)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 31e5620b..62ff94c 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -288,7 +288,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
set(LAPACK_SEARCH_LIBS "")
if (BLA_F95)
- set(LAPACK_mkl_SEARCH_SYMBOL "CHEEV")
+ set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")
set(_LIBRARIES LAPACK95_LIBRARIES)
set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
@@ -299,7 +299,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_intel_${BLAS_mkl_ILP_MODE}")
+ "mkl_lapack95_${BLAS_mkl_ILP_MODE}")
else()
set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
set(_LIBRARIES LAPACK_LIBRARIES)