CMake: Bugfixes: Only check mpi consistency for "libmpi." and "libmpi_cxx."

git-svn-id: https://svn.dealii.org/trunk@33014 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/macros/macro_check_mpi_interface.cmake b/deal.II/cmake/macros/macro_check_mpi_interface.cmake
index e6d4295e0156ea99ca90b8c1b573ba7e5d87721c..7099bb22429782b4a47721a43d6e69c2ca1b6416 100644 (file)
--- a/deal.II/cmake/macros/macro_check_mpi_interface.cmake
+++ b/deal.II/cmake/macros/macro_check_mpi_interface.cmake
@@ -28,8 +28,7 @@ MACRO(CHECK_MPI_INTERFACE _feature _var)
     SET(_nope FALSE)
 
     FOREACH(_library ${${_feature}_LIBRARIES})
-      IF( _library MATCHES "/libmpi[^/]*\\.so"
-          AND NOT _library MATCHES "f(77|90|ort)" )
+      IF( _library MATCHES "/libmpi(|_cxx)\\.(a|so)[^/]*$")
 
         GET_FILENAME_COMPONENT(_file1 ${_library} REALPATH)
 
@@ -44,6 +43,7 @@ MACRO(CHECK_MPI_INTERFACE _feature _var)
 
         IF(_not_found)
           SET(_nope TRUE)
+          SET(_spurious_library ${_library})
           BREAK()
         ENDIF()
       ENDIF()
@@ -60,7 +60,7 @@ MACRO(CHECK_MPI_INTERFACE _feature _var)
         "Could not find a sufficient ${_feature} installation:\n"
         "${_feature} has to be compiled against the same MPI library as deal.II "
         "but the link line of ${_feature} contains:\n"
-        "  ${_mpi_library}\n"
+        "  ${_spurious_library}\n"
         "which is not listed in MPI_LIBRARIES:\n"
         "  MPI_LIBRARIES = \"${_str}\"\n"
         )