Merge topic 'FindBLAS-oneAPI-mkl'

130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6210

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})

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})