From: Andre Massing Date: Fri, 3 Oct 2014 21:58:25 +0000 (+0200) Subject: Added additional names for scalapack and blacs related libs on ubuntu 14.04 X-Git-Tag: v8.2.0-rc1~114^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0d50ea74f9c21fed1bfe773e78f5d3759459713;p=dealii.git Added additional names for scalapack and blacs related libs on ubuntu 14.04 --- diff --git a/cmake/modules/FindMUMPS.cmake b/cmake/modules/FindMUMPS.cmake index e8e5f1ff4d..5aa4bc22ea 100644 --- a/cmake/modules/FindMUMPS.cmake +++ b/cmake/modules/FindMUMPS.cmake @@ -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 )