From f492f307bb157c0a8a64f63c88450e2e351b6d1e Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 4 Oct 2012 14:30:08 +0000 Subject: [PATCH] Some Bugfixes w.r.t. mumps git-svn-id: https://svn.dealii.org/branches/branch_cmake@26955 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindMUMPS.cmake | 2 +- deal.II/cmake/modules/FindSCALAPACK.cmake | 33 ++++++++++++----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 5dc37e43bd..07280d1da9 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -86,7 +86,7 @@ SET(MUMPS_LINKER_FLAGS FIND_PACKAGE_HANDLE_STANDARD_ARGS(MUMPS DEFAULT_MSG DMUMPS_LIBRARY MUMPS_COMMON_LIBRARY - LAPACK_FOUND + SCALAPACK_FOUND ) IF(MUMPS_FOUND) diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 1dd003492b..05af088d5f 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -32,8 +32,6 @@ INCLUDE(FindPackageHandleStandardArgs) # SCALAPACK needs LAPACK and BLAS as dependency, search for them with the help # of the LAPACK find module: # -# TODO: ScaLAPACK and mpi... -# FIND_PACKAGE(LAPACK) FIND_LIBRARY(SCALAPACK_LIBRARY @@ -57,19 +55,22 @@ SET(SCALAPACK_LINKER_FLAGS # be necessary to search for blacs, too. So we do this in a very # probabilistic way... # -FIND_LIBRARY(BLACS_LIBRARY - NAMES blacs # TODO - ${BLACS_DIR} - ${SCALAPACK_DIR} - ${SCALAPACK_DIR}/../blacs/ - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) +FOREACH(lib blacs blacsCinit blacsF77init) + STRING(TOUPPER "${lib}" lib_upper) + FIND_LIBRARY(${lib_upper}_LIBRARY + NAMES ${lib} ${lib}_MPI-LINUX-0 + ${BLACS_DIR} + ${SCALAPACK_DIR} + ${SCALAPACK_DIR}/../blacs/ + PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib LIB + ) + IF(NOT ${lib_upper}_LIBRARY MATCHES "-NOTFOUND") + LIST(APPEND SCLAPACK_LIBRARIES + ${${lib_upper}_LIBRARY} + ) + ENDIF() +ENDFOREACH() -IF(NOT BLACS_LIBRARY MATCHES "-NOTFOUND") - LIST(APPEND SCLAPACK_LIBRARIES - ${BLACS_LIBRARY} - ) -ENDIF() FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK DEFAULT_MSG SCALAPACK_LIBRARY @@ -83,6 +84,8 @@ IF(SCALAPACK_FOUND) blas_LIBRARY SCALAPACK_LIBRARY BLACS_LIBRARY - ) + BLACSCINIT_LIBRARY + BLACSF77INIT_LIBRARY + ) ENDIF() -- 2.39.5