A few more tweaks to enable using an external scalapack library on ad…

…ditional platforms.
RMGDFT · Jul 8, 2022 · 47f930b · 47f930b
1 parent 72971d6
commit 47f930b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,7 +210,9 @@ endif()
 
 # Look for scalapack
 if(NOT USE_INTERNAL_SCALAPACK)
-   find_package(SCALAPACK)
+   if(NOT CRAY_HOST)
+       find_package(SCALAPACK)
+   endif()
 endif()
 
 

diff --git a/cmake/Modules/FindSCALAPACK.cmake b/cmake/Modules/FindSCALAPACK.cmake
@@ -13,7 +13,7 @@ find_library (SCALAPACK_LIBRARIES NAMES scalapack)
 # if not found try using the MPI library path as a hint
 # since it's often included there
 if(NOT SCALAPACK_LIBRARIES)
-    get_filename_component(RMG_MPI_LIB_PATH ${MPI_C_LIBRARIES} PATH CACHE)
+    get_filename_component(RMG_MPI_LIB_PATH ${MPI_C_LIBRARIES} DIRECTORY CACHE)
 endif()
 find_library (SCALAPACK_LIBRARIES NAMES scalapack
     HINTS "${RMG_MPI_LIB_PATH}" "$ENV{SCALAPACK_LIB}"