diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-14 13:46:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-14 13:47:31 (GMT) |
| commit | 60227954742d0a689df6e5ca204872517cccb513 (patch) | |
| tree | 38b5dbf2a6a2ec16a7ab4d89382b46b9d1920eb0 | |
| parent | f245a20ad033f6977335cc89bde59ec8de8445c8 (diff) | |
| parent | 130fa72bb336bf0a30aef297b1441594c147398e (diff) | |
| download | CMake-60227954742d0a689df6e5ca204872517cccb513.zip CMake-60227954742d0a689df6e5ca204872517cccb513.tar.gz CMake-60227954742d0a689df6e5ca204872517cccb513.tar.bz2 | |
Merge topic 'FindBLAS-oneAPI-mkl'
130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6210
| -rw-r--r-- | Modules/FindBLAS.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 826a9c2..dc35f01 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -533,7 +533,9 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") "compiler/lib/${BLAS_mkl_ARCH_NAME}" "mkl/lib" "mkl/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}" "mkl/lib/${BLAS_mkl_ARCH_NAME}" - "lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}") + "lib" "lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}" + "lib/${BLAS_mkl_ARCH_NAME}" + ) foreach(IT ${BLAS_SEARCH_LIBS}) string(REPLACE " " ";" SEARCH_LIBS ${IT}) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index fa2300d..bb49039 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -387,7 +387,9 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE) "compiler/lib/${LAPACK_mkl_ARCH_NAME}" "mkl/lib" "mkl/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" "mkl/lib/${LAPACK_mkl_ARCH_NAME}" - "lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}") + "lib" "lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" + "lib/${LAPACK_mkl_ARCH_NAME}" + ) # First try empty lapack libs if(NOT ${_LIBRARIES}) |