]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Remove DEAL_II_ALLOW_GENERIC_MPI and handle this with DEAL_II_WITH_MPI directly
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 15 Mar 2013 00:26:35 +0000 (00:26 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 15 Mar 2013 00:26:35 +0000 (00:26 +0000)
git-svn-id: https://svn.dealii.org/trunk@28908 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_1_mpi.cmake
deal.II/doc/development/Config.sample

index 646d02c0f1e5c7dbea211131662c21c6ddcfa8fd..0cf78901ffbe76bae5f6ef8e979f01c31e5f420e 100644 (file)
 # 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)
index 19a4cf08238b79dc751a5e783c1746ae975b5c50..3fb2f0f1424ada8e7376ea5cadecd1c9b973e16a 100644 (file)
 #   "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:
 #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.