From: maier Date: Thu, 4 Oct 2012 14:29:51 +0000 (+0000) Subject: Bugfixes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbae3362284cc3f223594300c0e1146192660412;p=dealii-svn.git Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26953 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_mumps.cmake b/deal.II/cmake/configure/configure_mumps.cmake index 82254c9cb6..6048ce0a6b 100644 --- a/deal.II/cmake/configure/configure_mumps.cmake +++ b/deal.II/cmake/configure/configure_mumps.cmake @@ -35,7 +35,10 @@ ENDMACRO() MACRO(FEATURE_MUMPS_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${MUMPS_INCLUDE_DIRS}) - LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${MUMPS_LIBRARIES}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES + ${MUMPS_LIBRARIES} + ${MPI_CXX_LIBRARIES} # for good measure + ) ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MUMPS_LINKER_FLAGS}") SET(DEAL_II_USE_MUMPS TRUE) diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 9be2efd77d..5dc37e43bd 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -35,7 +35,6 @@ FIND_PACKAGE(SCALAPACK) # which will also include lapack and blas # # TODO: mumps might link to scotch and or metis as well. Ignore this for # now. :-] -# TODO: libpord.a ? # FIND_PATH(MUMPS_INCLUDE_DIRS dmumps_c.h @@ -65,6 +64,21 @@ SET(MUMPS_LIBRARIES ${LAPACK_LIBRARIES} ) +# +# If we can find libport.a (or similiar), link it in as well: +# +FIND_LIBRARY(PORD_LIBRARY + NAMES port + HINTS + ${MUMPS_DIR} + PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib + ) +IF(NOT PORD_LIBRARY MATCHES "-NOTFOUND") + LIST(APPEND MUMPS_LIBRARIES + ${PORD_LIBRARY} + ) +ENDIF() + SET(MUMPS_LINKER_FLAGS ${LAPACK_LINKER_FLAGS} ) @@ -80,6 +94,7 @@ IF(MUMPS_FOUND) DMUMPS_LIBRARY MUMPS_COMMON_LIBRARY MUMPS_INCLUDE_DIRS + PORT_LIBRARY ) ENDIF()