]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:51 +0000 (14:29 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:51 +0000 (14:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26953 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_mumps.cmake
deal.II/cmake/modules/FindMUMPS.cmake

index 82254c9cb6b7b437d605b9fe8731dd3dc80151ef..6048ce0a6b904fe0ec9b42388a01386a350af181 100644 (file)
@@ -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)
index 9be2efd77df76eae5a0c46601ee990f842a09983..5dc37e43bd1d26cb7a020a4c1d59c1ba8d78a395 100644 (file)
@@ -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()
 

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.