]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Added additional names for scalapack and blacs related libs on ubuntu 14.04 188/head
authorAndre Massing <massing@simula.no>
Fri, 3 Oct 2014 21:58:25 +0000 (23:58 +0200)
committerAndre Massing <massing@simula.no>
Fri, 3 Oct 2014 21:58:25 +0000 (23:58 +0200)
cmake/modules/FindMUMPS.cmake

index e8e5f1ff4d35b711de6942b430efb69ac0874cde..5aa4bc22ea4c05cc482850fc3344fe11ddcf01ed 100644 (file)
@@ -38,7 +38,7 @@ SET_IF_EMPTY(BLACS_DIR "$ENV{BLACS_DIR}")
 # Search for scalapack:
 #
 
-DEAL_II_FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
+DEAL_II_FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack scalapack-openmpi
   HINTS ${SCALAPACK_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
@@ -51,7 +51,7 @@ DEAL_II_FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
 FOREACH(_lib blacs blacsCinit blacsF77init)
   STRING(TOUPPER "${_lib}" _lib_upper)
   DEAL_II_FIND_LIBRARY(${_lib_upper}_LIBRARY
-    NAMES ${_lib} ${_lib}_MPI-LINUX-0 ${_lib}_MPI-DARWIN-0
+    NAMES ${_lib} ${_lib}_MPI-LINUX-0 ${_lib}_MPI-DARWIN-0 ${_lib}-openmpi
     HINTS ${BLACS_DIR} ${SCALAPACK_DIR} ${SCALAPACK_DIR}/../blacs/
     PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib LIB
   )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.