From cd35bbea5a09a1f30a11aa8739a948560ddd2147 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 15 Mar 2013 00:26:35 +0000 Subject: [PATCH] CMake: Remove DEAL_II_ALLOW_GENERIC_MPI and handle this with DEAL_II_WITH_MPI directly git-svn-id: https://svn.dealii.org/trunk@28908 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_1_mpi.cmake | 10 +++------- deal.II/doc/development/Config.sample | 10 ++++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/deal.II/cmake/configure/configure_1_mpi.cmake b/deal.II/cmake/configure/configure_1_mpi.cmake index 646d02c0f1..0cf78901ff 100644 --- a/deal.II/cmake/configure/configure_1_mpi.cmake +++ b/deal.II/cmake/configure/configure_1_mpi.cmake @@ -16,10 +16,6 @@ # Configuration for mpi support: # -SET(DEAL_II_ALLOW_GENERIC_MPI OFF CACHE BOOL - "Allow the usage of an external mpi library even if the current compiler is not an mpi wrapper" - ) - MACRO(FEATURE_MPI_FIND_EXTERNAL var) # @@ -33,10 +29,10 @@ MACRO(FEATURE_MPI_FIND_EXTERNAL var) IF(NOT MPI_CXX_FOUND) # # CMAKE_CXX_COMPILER is apparently not an mpi wrapper. - # If we're allowed to do so, search for a generic mpi implementation - # and use it. + # So, let's be a bit more aggressive in finding MPI if DEAL_II_WITH_MPI + # is set. # - IF(DEAL_II_ALLOW_GENERIC_MPI) + IF(DEAL_II_WITH_MPI) SET(MPI_FOUND) UNSET(MPI_C_COMPILER CACHE) UNSET(MPI_CXX_COMPILER CACHE) diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample index 19a4cf0823..3fb2f0f142 100644 --- a/deal.II/doc/development/Config.sample +++ b/deal.II/doc/development/Config.sample @@ -236,14 +236,16 @@ # "Build deal.II with support for mpi" # ) # -# SET(DEAL_II_ALLOW_GENERIC_MPI ON CACHE BOOL -# "Allow the usage of an external mpi library even if the current compiler is not an mpi wrapper" -# ) -# # Automatic detection: # +# If DEAL_II_WITH_MPI is undefined, autodetection of MPI is very +# conservative. Only the current compiler and the variables MPI_C_COMPILER +# and MPI_CXX_COMPILER are used to find MPI. DEAL_II_WITH_MPI=ON will +# trigger a more sophisticated search for MPI. +# # The best way to force a specific MPI implementation to be used is to set # set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to the appropriate MPI wrapper. +# # Alternatively, specify the mpi wrappers that will be queried for the mpi # link interface: # -- 2.39.5