mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-20 04:24:36 +08:00
Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT
Add search paths for the Intel oneAPI MKL directory structure so that we do not rely on paths in `LD_LIBRARY_PATH`.
This commit is contained in:
@@ -533,7 +533,9 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
|
|||||||
"compiler/lib/${BLAS_mkl_ARCH_NAME}"
|
"compiler/lib/${BLAS_mkl_ARCH_NAME}"
|
||||||
"mkl/lib" "mkl/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}"
|
"mkl/lib" "mkl/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}"
|
||||||
"mkl/lib/${BLAS_mkl_ARCH_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})
|
foreach(IT ${BLAS_SEARCH_LIBS})
|
||||||
string(REPLACE " " ";" SEARCH_LIBS ${IT})
|
string(REPLACE " " ";" SEARCH_LIBS ${IT})
|
||||||
|
@@ -387,7 +387,9 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
|
|||||||
"compiler/lib/${LAPACK_mkl_ARCH_NAME}"
|
"compiler/lib/${LAPACK_mkl_ARCH_NAME}"
|
||||||
"mkl/lib" "mkl/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}"
|
"mkl/lib" "mkl/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}"
|
||||||
"mkl/lib/${LAPACK_mkl_ARCH_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
|
# First try empty lapack libs
|
||||||
if(NOT ${_LIBRARIES})
|
if(NOT ${_LIBRARIES})
|
||||||
|
Reference in New Issue
Block a user