From: Matthias Maier Date: Sat, 12 Oct 2013 19:29:51 +0000 (+0000) Subject: Bugfix X-Git-Tag: v8.1.0~570^2~73 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856b1f6cc7b3baaf04682a74d4b2389018e61577;p=dealii.git Bugfix git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31211 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_mpi.cmake b/deal.II/cmake/configure/configure_1_mpi.cmake index 0d1050a8aa..26f1334e62 100644 --- a/deal.II/cmake/configure/configure_1_mpi.cmake +++ b/deal.II/cmake/configure/configure_1_mpi.cmake @@ -85,7 +85,7 @@ MACRO(FEATURE_MPI_FIND_EXTERNAL var) # # Manually assemble some version information: # - IF(EXISTS ${MPI_INCLUDE_PATH}/mpi.h) + IF(EXISTS ${MPI_INCLUDE_PATH}/mpi.h AND NOT DEFINED MPI_VERSION) FILE(STRINGS "${MPI_INCLUDE_PATH}/mpi.h" MPI_VERSION_MAJOR_STRING REGEX "#define.*MPI_VERSION") STRING(REGEX REPLACE "^.*MPI_VERSION.*([0-9]+).*" "\\1"