From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 1 May 2018 23:30:39 +0000 (-0500)
Subject: CMake: Remove OpenMPI specific version detection
X-Git-Tag: v9.0.0-rc1~43^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8efb37b92c4a904a7c690d00e577e4ab4cdac1e;p=dealii.git

CMake: Remove OpenMPI specific version detection
---

diff --git a/cmake/modules/FindMPI.cmake b/cmake/modules/FindMPI.cmake
index e88f0d4053..5b5efb0195 100644
--- a/cmake/modules/FindMPI.cmake
+++ b/cmake/modules/FindMPI.cmake
@@ -102,32 +102,6 @@ IF(NOT MPI_MPI_H MATCHES "-NOTFOUND" AND NOT DEFINED MPI_VERSION)
     SET(MPI_VERSION_MAJOR)
     SET(MPI_VERSION_MINOR)
   ENDIF()
-
-  # OMPI specific version number:
-  FILE(STRINGS ${MPI_MPI_H} OMPI_VERSION_MAJOR_STRING
-    REGEX "#define.*OMPI_MAJOR_VERSION")
-  STRING(REGEX REPLACE "^.*OMPI_MAJOR_VERSION[ ]+([0-9]+).*" "\\1"
-    OMPI_VERSION_MAJOR "${OMPI_VERSION_MAJOR_STRING}"
-    )
-  FILE(STRINGS ${MPI_MPI_H} OMPI_VERSION_MINOR_STRING
-    REGEX "#define.*OMPI_MINOR_VERSION")
-  STRING(REGEX REPLACE "^.*OMPI_MINOR_VERSION[ ]+([0-9]+).*" "\\1"
-    OMPI_VERSION_MINOR "${OMPI_VERSION_MINOR_STRING}"
-    )
-  FILE(STRINGS ${MPI_MPI_H} OMPI_VERSION_RELEASE_STRING
-    REGEX "#define.*OMPI_RELEASE_VERSION")
-  STRING(REGEX REPLACE "^.*OMPI_RELEASE_VERSION[ ]+([0-9]+).*" "\\1"
-    OMPI_VERSION_SUBMINOR "${OMPI_VERSION_RELEASE_STRING}"
-    )
-  SET(OMPI_VERSION
-    "${OMPI_VERSION_MAJOR}.${OMPI_VERSION_MINOR}.${OMPI_VERSION_SUBMINOR}"
-    )
-  IF("${OMPI_VERSION}" STREQUAL "..")
-    SET(OMPI_VERSION)
-    SET(OMPI_VERSION_MAJOR)
-    SET(OMPI_VERSION_MINOR)
-    SET(OMPI_VERSION_SUBMINOR)
-  ENDIF()
 ENDIF()
 
 DEAL_II_PACKAGE_HANDLE(MPI
diff --git a/cmake/setup_write_config.cmake b/cmake/setup_write_config.cmake
index 60e6efcd47..d6a98a328c 100644
--- a/cmake/setup_write_config.cmake
+++ b/cmake/setup_write_config.cmake
@@ -207,9 +207,6 @@ FOREACH(_feature ${_deal_ii_features_sorted})
     IF(_feature MATCHES "THREADS" AND DEFINED TBB_VERSION)
       _detailed("#            TBB_VERSION = ${TBB_VERSION}\n")
     ENDIF()
-    IF(_feature MATCHES "MPI" AND DEFINED OMPI_VERSION)
-      _detailed("#            OMPI_VERSION = ${OMPI_VERSION}\n")
-    ENDIF()
     IF(_feature MATCHES "CUDA" AND DEFINED CUDA_COMPUTE_CAPABILITY)
       _detailed("#            CMAKE_CUDA_COMPILER = ${CMAKE_CUDA_COMPILER}\n")
       _detailed("#            CUDA_COMPUTE_CAPABILITY = ${CUDA_COMPUTE_CAPABILITY_MAJOR}.${CUDA_COMPUTE_CAPABILITY_MINOR}\n")