more conservative use of ENV{MKLROOT}

CMakeLists.txt

@@ -43,7 +43,7 @@ find_package(Threads)
 
 if(parallel)
   find_package(MPI COMPONENTS C Fortran REQUIRED)
-  if(NOT DEFINED ENV{MKLROOT} OR NOT scalapack)
+  if(NOT DEFINED ENV{MKLROOT} AND NOT LAPACK_VENDOR MATCHES "^MKL" OR NOT scalapack)
     # oneMKL MKLConfig.cmake must be invoked only once
     include(cmake/lapack.cmake)
   endif()

cmake/FindLAPACK.cmake

@@ -364,8 +364,9 @@ if(NOT (lapack_cray
   OR Netlib IN_LIST LAPACK_FIND_COMPONENTS
   OR Atlas IN_LIST LAPACK_FIND_COMPONENTS
   OR MKL IN_LIST LAPACK_FIND_COMPONENTS
+  OR MKL64 IN_LIST LAPACK_FIND_COMPONENTS
   OR AOCL IN_LIST LAPACK_FIND_COMPONENTS))
-  if(DEFINED ENV{MKLROOT})
+  if(DEFINED ENV{MKLROOT} AND IS_DIRECTORY "$ENV{MKLROOT}")
     list(APPEND LAPACK_FIND_COMPONENTS MKL)
   else()
     list(APPEND LAPACK_FIND_COMPONENTS Netlib)

cmake/FindSCALAPACK.cmake

@@ -194,7 +194,7 @@ if(DEFINED ENV{CRAYPE_VERSION})
 endif()
 
 if(NOT scalapack_cray)
-  if(NOT MKL IN_LIST SCALAPACK_FIND_COMPONENTS AND DEFINED ENV{MKLROOT})
+  if(NOT MKL IN_LIST SCALAPACK_FIND_COMPONENTS AND DEFINED ENV{MKLROOT} AND IS_DIRECTORY "$ENV{MKLROOT}")
     list(APPEND SCALAPACK_FIND_COMPONENTS MKL)
   endif()
 endif()

cmake/config.cmake.in

@@ -16,12 +16,13 @@ set(MUMPS_d_FOUND @BUILD_DOUBLE@)
 set(MUMPS_c_FOUND @BUILD_COMPLEX@)
 set(MUMPS_z_FOUND @BUILD_COMPLEX16@)
 
-if(NOT DEFINED ENV{MKLROOT})
-  find_dependency(LAPACK COMPONENTS ${MUMPS_LAPACK_VENDOR})
-endif()
-
 if(MUMPS_parallel)
   find_dependency(MPI COMPONENTS C Fortran)
+
+  if(NOT MUMPS_LAPACK_VENDOR MATCHES "^MKL")
+    find_dependency(LAPACK COMPONENTS ${MUMPS_LAPACK_VENDOR})
+  endif()
+
   find_dependency(SCALAPACK)
 else()
   find_dependency(LAPACK COMPONENTS ${MUMPS_LAPACK_VENDOR})

cmake/lapack.cmake

@@ -1,6 +1,6 @@
 # Handle options for finding LAPACK
 
-if(NOT DEFINED LAPACK_VENDOR AND DEFINED ENV{MKLROOT})
+if(NOT DEFINED LAPACK_VENDOR AND DEFINED ENV{MKLROOT} AND IS_DIRECTORY "$ENV{MKLROOT}")
   set(LAPACK_VENDOR MKL)
 endif()
 

cmake/scalapack.cmake

@@ -3,11 +3,11 @@ include(GNUInstallDirs)
 
 if(find)
 
-if(NOT DEFINED SCALAPACK_VENDOR AND DEFINED ENV{MKLROOT})
+if(NOT DEFINED SCALAPACK_VENDOR AND LAPACK_VENDOR MATCHES "^MKL")
   set(SCALAPACK_VENDOR MKL)
 endif()
 
-if(MKL IN_LIST SCALAPACK_VENDOR)
+if(MKL IN_LIST SCALAPACK_VENDOR AND NOT MKL64 IN_LIST SCALAPACK_VENDOR)
   if(intsize64)
     list(APPEND SCALAPACK_VENDOR MKL64)
   endif()