From 79aaaba4108b27f8ead34b744154d39d67e3c020 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 30 Mar 2017 17:38:47 -0500 Subject: [PATCH] CMake: Workaround: Ensure "mpiuni/mpi.h" is reachable In case of a sequential build without mpi support and sequential petsc a dummy mpi.h file installed by petsc must be reachable in from our final set of include directories. Normally this is not an issue - petsc exports such information in the file "petscvariables" that we parse. But some distributions have chosen to not install this file... Closes #4157 --- cmake/modules/FindPETSC.cmake | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindPETSC.cmake b/cmake/modules/FindPETSC.cmake index dccc9f6084..690d82c3c3 100644 --- a/cmake/modules/FindPETSC.cmake +++ b/cmake/modules/FindPETSC.cmake @@ -197,16 +197,29 @@ IF(NOT PETSC_PETSCVARIABLES MATCHES "-NOTFOUND") ENDFOREACH() ENDIF() +IF(PETSC_WITH_MPIUNI) + # + # Workaround: Some distributions happen to not install petscvariables and + # we consequently might miss some essential include directories. Let's + # try at least to find the mpiuni include directory. + # + DEAL_II_FIND_PATH(PETSC_INCLUDE_DIR_MPIUNI mpiuni/mpi.h + HINTS ${PETSC_INCLUDE_DIR_COMMON} ${PETSC_INCLUDE_DIR_ARCH} ${_petsc_includes} + PATH_SUFFIXES petsc + ) + SET(PETSC_INCLUDE_DIR_MPIUNI "${PETSC_INCLUDE_DIR_MPIUNI}/mpiuni") +ENDIF() + DEAL_II_PACKAGE_HANDLE(PETSC LIBRARIES REQUIRED PETSC_LIBRARY OPTIONAL _petsc_libraries INCLUDE_DIRS REQUIRED PETSC_INCLUDE_DIR_COMMON PETSC_INCLUDE_DIR_ARCH - OPTIONAL _petsc_includes + OPTIONAL PETSC_INCLUDE_DIR_MPIUNI _petsc_includes USER_INCLUDE_DIRS REQUIRED PETSC_INCLUDE_DIR_COMMON PETSC_INCLUDE_DIR_ARCH - OPTIONAL _petsc_includes + OPTIONAL PETSC_INCLUDE_DIR_MPIUNI _petsc_includes CLEAR PETSC_LIBRARY PETSC_INCLUDE_DIR_COMMON PETSC_INCLUDE_DIR_ARCH PETSC_PETSCVARIABLES ${_cleanup_variables} -- 2.39.5