From 456ecd626e32e7827f00ecf27f5dae52acd8e133 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 26 May 2014 20:17:08 +0000 Subject: [PATCH] CMake: Bugfix: Disable MPI check. This was a bad idea. git-svn-id: https://svn.dealii.org/trunk@32980 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/configure/configure_2_metis.cmake | 2 - .../configure/configure_2_trilinos.cmake | 2 - .../cmake/configure/configure_3_petsc.cmake | 2 - deal.II/cmake/configure/configure_hdf5.cmake | 2 - deal.II/cmake/configure/configure_mumps.cmake | 10 ---- deal.II/cmake/configure/configure_p4est.cmake | 2 - .../macros/macro_check_mpi_interface.cmake | 60 ------------------- 7 files changed, 80 deletions(-) delete mode 100644 deal.II/cmake/macros/macro_check_mpi_interface.cmake diff --git a/deal.II/cmake/configure/configure_2_metis.cmake b/deal.II/cmake/configure/configure_2_metis.cmake index 4d499c0d60..d5142a5432 100644 --- 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 a79505384b..aa7920e6b7 100644 --- 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 662c30f8a3..19675f272c 100644 --- 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 6a335a232c..84ff9b6963 100644 --- 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 ce1d2652b1..213d1d320a 100644 --- 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 25acd30d86..eda005d2c5 100644 --- 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 index c26edc40f7..0000000000 --- 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() - -- 2.39.5