From: Daniel Arndt Date: Wed, 16 May 2018 23:14:47 +0000 (+0200) Subject: Make sure to set default values for MPI_VERSION_* X-Git-Tag: v9.1.0-rc1~1137^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae6b83557499bdb3ea2739476449be605dd4968;p=dealii.git Make sure to set default values for MPI_VERSION_* --- diff --git a/cmake/modules/FindMPI.cmake b/cmake/modules/FindMPI.cmake index cbe43f7f13..ef9692a8a1 100644 --- a/cmake/modules/FindMPI.cmake +++ b/cmake/modules/FindMPI.cmake @@ -109,20 +109,19 @@ IF(NOT MPI_MPI_H MATCHES "-NOTFOUND" AND NOT DEFINED MPI_VERSION) MPI_VERSION_MINOR "${MPI_VERSION_MINOR_STRING}" ) SET(MPI_VERSION "${MPI_VERSION_MAJOR}.${MPI_VERSION_MINOR}") +ENDIF() - # - # Except - this doesn't always work. Some distributions install a header - # stub mpi.h that includes the right mpi header depending on the - # architecture. In this case we are really out of luck. It is not - # straightforward to find the correct header file to query the version - # information from. Just set a very conservative default: - # - IF(MPI_VERSION STREQUAL ".") - SET(MPI_VERSION "0.0") - SET(MPI_VERSION_MAJOR "0") - SET(MPI_VERSION_MINOR "0") - ENDIF() - +# +# Except - this doesn't always work. Some distributions install a header +# stub mpi.h that includes the right mpi header depending on the +# architecture. In this case we are really out of luck. It is not +# straightforward to find the correct header file to query the version +# information from. Just set a very conservative default: +# +IF(NOT DEFINED MPI_VERSION OR MPI_VERSION STREQUAL ".") + SET(MPI_VERSION "0.0") + SET(MPI_VERSION_MAJOR "0") + SET(MPI_VERSION_MINOR "0") ENDIF() DEAL_II_PACKAGE_HANDLE(MPI