From 130fa72bb336bf0a30aef297b1441594c147398e Mon Sep 17 00:00:00 2001
From: Peter Knowles <KnowlesPJ@Cardiff.ac.uk>
Date: Wed, 9 Jun 2021 08:45:56 +0100
Subject: 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`.
---
 Modules/FindBLAS.cmake   | 4 +++-
 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})
-- 
cgit v0.12