]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some Bugfixes w.r.t. mumps
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:30:08 +0000 (14:30 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:30:08 +0000 (14:30 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26955 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/modules/FindMUMPS.cmake
deal.II/cmake/modules/FindSCALAPACK.cmake

index 5dc37e43bd1d26cb7a020a4c1d59c1ba8d78a395..07280d1da98e61eb0a1f4b9d84bd98847f693614 100644 (file)
@@ -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)
index 1dd003492b8ccd63cd70095ca25de53d3fcd3929..05af088d5f7008bc75a6bd0fdaf151ba2decd059 100644 (file)
@@ -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()
 

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.