[CMake] Adding Scalapack finding in CMake configuration for Trilinos cmake

Author: loumalouomega

cmake_modules/FindTRILINOS.cmake

@@ -54,8 +54,9 @@ IF (TRILINOS_LIBRARY_DIR)
     SET(TRILINOS_LIB_SEARCH_PATH ${TRILINOS_LIBRARY_DIR})
 ELSE (TRILINOS_LIBRARY_DIR)
     SET(TRILINOS_LIB_SEARCH_PATH
-        /usr/lib64
-        /usr/lib
+        /usr/lib64/
+        /usr/lib/
+        /usr/local/lib64/
         /usr/local/lib/
         /usr/lib/x86_64-linux-gnu/
     )
@@ -65,7 +66,7 @@ IF (TRILINOS_INCLUDE_DIR)
     SET(TRILINOS_INCLUDE_SEARCH_PATH ${TRILINOS_INCLUDE_DIR})
 ELSE (TRILINOS_INCLUDE_DIR)
     SET(TRILINOS_INCLUDE_SEARCH_PATH
-        /usr/include
+        /usr/include/
         /usr/local/include/
         /usr/include/trilinos/
     ) 
@@ -127,9 +128,12 @@ IF(NOT TRIUTILS_LIBRARY)
 ENDIF(NOT TRIUTILS_LIBRARY)
 
 FIND_LIBRARY(LOCA_EPETRA_LIBRARY    "${TRILINOS_LIBRARY_PREFIX}locaepetra"         ${TRILINOS_LIB_SEARCH_PATH}  NO_DEFAULT_PATH)
-FIND_LIBRARY(NOX_EPETRA_LIBRARY     "${TRILINOS_LIBRARY_PREFIX}noxepetra"         ${TRILINOS_LIB_SEARCH_PATH}  NO_DEFAULT_PATH)
+FIND_LIBRARY(NOX_EPETRA_LIBRARY     "${TRILINOS_LIBRARY_PREFIX}noxepetra"          ${TRILINOS_LIB_SEARCH_PATH}  NO_DEFAULT_PATH)
 FIND_LIBRARY(EPETRAEXT_LIBRARY      "${TRILINOS_LIBRARY_PREFIX}epetraext"          ${TRILINOS_LIB_SEARCH_PATH}  NO_DEFAULT_PATH)
 
+# NOTE: Scalapack may be a dependency of Trilinos due to MUMPS but is not provided by Trilinos
+FIND_LIBRARY(SCALAPACK_LIBRARY      "scalapack"                                    ${TRILINOS_LIB_SEARCH_PATH}  NO_DEFAULT_PATH)
+
 IF(TEUCHOS_LIBRARY)
     SET(TEUCHOS_LIBRARIES "${TEUCHOS_LIBRARY}")
 ELSEIF(TEUCHOSCOMM_LIBRARY AND TEUCHOSCORE_LIBRARY AND TEUCHOSNUMERICS_LIBRARY AND TEUCHOSPARAMETERLIST_LIBRARY AND TEUCHOSREMAINDER_LIBRARY)
@@ -230,6 +234,13 @@ IF(EPETRAEXT_INCLUDE_PATH AND EPETRAEXT_LIBRARY)
     find_package_handle_standard_args(EPETRAEXT DEFAULT_MSG EPETRAEXT_LIBRARY)
 ENDIF(EPETRAEXT_INCLUDE_PATH AND EPETRAEXT_LIBRARY)
 
+# NOTE: Scalapack may be a dependency of Trilinos due to MUMPS but is not provided by Trilinos
+IF(SCALAPACK_LIBRARY)
+    SET(TRILINOS_LIBRARIES ${TRILINOS_LIBRARIES} ${SCALAPACK_LIBRARY})
+    SET(HAVE_SCALAPACK YES)
+    find_package_handle_standard_args(SCALAPACK DEFAULT_MSG SCALAPACK_LIBRARY)
+ENDIF(SCALAPACK_LIBRARY)
+
 LIST(LENGTH TRILINOS_INCLUDE_DIR LEN)
 IF(LEN GREATER 1)
     LIST(REMOVE_DUPLICATES TRILINOS_INCLUDE_DIR)