CMake: Bugfix: Disable MPI check. This was a bad idea.

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

diff --git a/deal.II/cmake/configure/configure_2_metis.cmake b/deal.II/cmake/configure/configure_2_metis.cmake
index 4d499c0d6088064e99511a187073137fe3165e46..d5142a5432de4df69e2e02a07ed96fc32519aedf 100644 (file)
--- a/deal.II/cmake/configure/configure_2_metis.cmake
+++ b/deal.II/cmake/configure/configure_2_metis.cmake
@@ -36,8 +36,6 @@ MACRO(FEATURE_METIS_FIND_EXTERNAL var)
         )
       SET(${var} FALSE)
     ENDIF()
-
-    CHECK_MPI_INTERFACE(METIS ${var})
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/configure/configure_2_trilinos.cmake b/deal.II/cmake/configure/configure_2_trilinos.cmake
index a79505384bc7ae189fac33c7cf157d202b6b9629..aa7920e6b7c1e6a4781b974c7d882f95ae01f1e6 100644 (file)
--- a/deal.II/cmake/configure/configure_2_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_2_trilinos.cmake
@@ -178,8 +178,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         SET(${var} FALSE)
       ENDIF()
     ENDIF()
-
-    CHECK_MPI_INTERFACE(TRILINOS ${var})
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/configure/configure_3_petsc.cmake b/deal.II/cmake/configure/configure_3_petsc.cmake
index 662c30f8a348b6ebbcd1dff457fb09a25a0fac53..19675f272cc8902a64842aae85a4adfa2eb95228 100644 (file)
--- a/deal.II/cmake/configure/configure_3_petsc.cmake
+++ b/deal.II/cmake/configure/configure_3_petsc.cmake
@@ -93,8 +93,6 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
         )
       SET(${var} FALSE)
     ENDIF()
-
-    CHECK_MPI_INTERFACE(PETSC ${var})
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/configure/configure_hdf5.cmake b/deal.II/cmake/configure/configure_hdf5.cmake
index 6a335a232c20aaa0304d02fbf4f87c00f817955f..84ff9b6963ec01ba93301299a0ebbc766f740259 100644 (file)
--- a/deal.II/cmake/configure/configure_hdf5.cmake
+++ b/deal.II/cmake/configure/configure_hdf5.cmake
@@ -40,8 +40,6 @@ MACRO(FEATURE_HDF5_FIND_EXTERNAL var)
         )
       SET(${var} FALSE)
     ENDIF()
-
-    CHECK_MPI_INTERFACE(HDF5 ${var})
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/configure/configure_mumps.cmake b/deal.II/cmake/configure/configure_mumps.cmake
index ce1d2652b10b4a50073bda70e578a6c716b66136..213d1d320a255ad2cbf33d6f7dbaf9e3e22147af 100644 (file)
--- a/deal.II/cmake/configure/configure_mumps.cmake
+++ b/deal.II/cmake/configure/configure_mumps.cmake
@@ -20,14 +20,4 @@
 
 SET(FEATURE_MUMPS_DEPENDS MPI LAPACK)
 
-
-MACRO(FEATURE_MUMPS_FIND_EXTERNAL var)
-  FIND_PACKAGE(MUMPS)
-
-  IF(MUMPS_FOUND)
-    SET(${var} TRUE)
-    CHECK_MPI_INTERFACE(MUMPS ${var})
-  ENDIF()
-ENDMACRO()
-
 CONFIGURE_FEATURE(MUMPS)

diff --git a/deal.II/cmake/configure/configure_p4est.cmake b/deal.II/cmake/configure/configure_p4est.cmake
index 25acd30d862478b6cf1b3f01d4eb761aee7bf7e9..eda005d2c5be88c7cf8c5045193304107c3bc757 100644 (file)
--- a/deal.II/cmake/configure/configure_p4est.cmake
+++ b/deal.II/cmake/configure/configure_p4est.cmake
@@ -55,8 +55,6 @@ MACRO(FEATURE_P4EST_FIND_EXTERNAL var)
         )
       SET(${var} FALSE)
     ENDIF()
-
-    CHECK_MPI_INTERFACE(P4EST ${var})
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/macros/macro_check_mpi_interface.cmake b/deal.II/cmake/macros/macro_check_mpi_interface.cmake
deleted file mode 100644 (file)
index c26edc4..0000000
--- a/deal.II/cmake/macros/macro_check_mpi_interface.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-## ---------------------------------------------------------------------
-## $Id$
-##
-## Copyright (C) 2014 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## The deal.II library is free software; you can use it, redistribute
-## it, and/or modify it under the terms of the GNU Lesser General
-## Public License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-## The full text of the license can be found in the file LICENSE at
-## the top level of the deal.II distribution.
-##
-## ---------------------------------------------------------------------
-
-#
-# Check whether a feature is compiled against the same MPI library as the
-# one deal.II picked up
-#
-# Usage:
-#     CHECK_MPI_INTERFACE(_feature _var),
-#
-
-MACRO(CHECK_MPI_INTERFACE _feature _var)
-  IF(DEAL_II_WITH_MPI)
-    SET(_nope FALSE)
-
-    FOREACH(_library ${${_feature}_LIBRARIES})
-      IF( _library MATCHES "/libmpi[^/]*\\.so"
-          AND NOT _library MATCHES "f(77|90|ort)" )
-        LIST(FIND MPI_LIBRARIES "${_library}" _position)
-        IF("${_position}" STREQUAL "-1")
-          SET(_nope TRUE)
-          SET(_mpi_library ${_library})
-          BREAK()
-        ENDIF()
-      ENDIF()
-    ENDFOREACH()
-
-    IF(_nope)
-      MESSAGE(STATUS "Could not find a sufficient ${_feature} installation: "
-        "${_feature} is compiled against a different MPI library than the one "
-        "deal.II picked up."
-        )
-      TO_STRING(_str ${MPI_LIBRARIES})
-      SET(PETSC_ADDITIONAL_ERROR_STRING
-        ${PETSC_ADDITIONAL_ERROR_STRING}
-        "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"
-        "which is not listed in MPI_LIBRARIES:\n"
-        "  MPI_LIBRARIES = \"${_str}\"\n"
-        )
-      SET(${_var} FALSE)
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-