From: Matthias Maier Date: Wed, 4 Jun 2014 17:41:04 +0000 (+0000) Subject: CMake: Bugfixes: Only check mpi consistency for "libmpi." and "libmpi_cxx." X-Git-Tag: v8.2.0-rc1~419 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e948cb3a11f345cf206f3130df9dae7ca4059d3;p=dealii.git 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 e6d4295e01..7099bb2242 100644 --- 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" )