From: Matthias Maier <tamiko@43-1.org>
Date: Fri, 12 Jan 2018 21:47:39 +0000 (-0600)
Subject: CMake: make the MPI compatibility check less strict
X-Git-Tag: v9.0.0-rc1~570^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5690%2Fhead;p=dealii.git

CMake: make the MPI compatibility check less strict

When configuring with CMake 3.10 and providing compiler wrappers,
  CC=mpicc CXX=mpicxx cmake ...
the new FindMPI.cmake library does not export MPI_CXX_LIBRARIES and
MPI_C_LIBRARIES any more. So, make the check less strict.
---

diff --git a/cmake/macros/macro_check_mpi_interface.cmake b/cmake/macros/macro_check_mpi_interface.cmake
index ea041ddc79..479cc55bd8 100644
--- a/cmake/macros/macro_check_mpi_interface.cmake
+++ b/cmake/macros/macro_check_mpi_interface.cmake
@@ -27,7 +27,7 @@ MACRO(CHECK_MPI_INTERFACE _feature _var)
     SET(_nope FALSE)
 
     FOREACH(_library ${${_feature}_LIBRARIES})
-      IF( _library MATCHES "/libmpi(|_cxx)\\.(a|so)[^/]*$")
+      IF( _library MATCHES "/libmpi\\.(a|so)[^/]*$")
 
         GET_FILENAME_COMPONENT(_file1 ${_library} REALPATH)