From 45c50c2dd19698c758200830a03fb36d08757f28 Mon Sep 17 00:00:00 2001
From: Yannick de Jong <ydejong@ignitioncomputing.com>
Date: Tue, 25 Jun 2024 16:50:35 +0200
Subject: [PATCH] Set HYPRE_HAVE_MPI_COMM_F2C in cmake build

---
 src/CMakeLists.txt                 | 31 +++++++++++++++++-------------
 src/config/HYPREConfig.cmake.in    |  1 +
 src/config/HYPRE_config.h.cmake.in |  3 ++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8da5f4be9..f0b2b7bc2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -147,6 +147,9 @@ option(TPL_BLAS_LIBRARIES            "Optional list of absolute paths to BLAS li
 option(TPL_LAPACK_LIBRARIES          "Optional list of absolute paths to LAPACK libraries, otherwise use FindLAPACK to locate [].")
 option(TPL_FEI_INCLUDE_DIRS          "List of absolute paths to FEI include directories [].")
 
+# Autoconf style functions
+include(CheckSymbolExists)
+
 # Set config name values
 if (HYPRE_ENABLE_SHARED)
   set(HYPRE_SHARED ON CACHE BOOL "" FORCE)
@@ -632,6 +635,21 @@ if (HYPRE_USING_UMPIRE)
   target_include_directories(${PROJECT_NAME} PUBLIC ${TPL_UMPIRE_INCLUDE_DIRS})
 endif ()
 
+# Set MPI compile flags
+if (NOT HYPRE_SEQUENTIAL)
+  find_program(MPIEXEC_EXECUTABLE NAMES mpiexec mpirun)
+  find_package(MPI REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC MPI::MPI_C)
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} MPI::MPI_C)
+  check_symbol_exists(MPI_Comm_f2c "mpi.h" HYPRE_HAVE_MPI_COMM_F2C)
+endif (NOT HYPRE_SEQUENTIAL)
+
+# Set OpenMP compile flags
+if (HYPRE_USING_OPENMP)
+  find_package(OpenMP REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_C)
+endif (HYPRE_USING_OPENMP)
+
 # Configure a header file to pass CMake settings to the source code
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/config/HYPRE_config.h.cmake.in"
@@ -663,19 +681,6 @@ if (HYPRE_USING_SYCL)
   set_source_files_properties(${HYPRE_GPU_SOURCES} PROPERTIES LANGUAGE CXX)
 endif ()
 
-# Set MPI compile flags
-if (NOT HYPRE_SEQUENTIAL)
-  find_program(MPIEXEC_EXECUTABLE NAMES mpiexec mpirun)
-  find_package(MPI REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PUBLIC MPI::MPI_C)
-endif (NOT HYPRE_SEQUENTIAL)
-
-# Set OpenMP compile flags
-if (HYPRE_USING_OPENMP)
-  find_package(OpenMP REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_C)
-endif (HYPRE_USING_OPENMP)
-
 if (MSVC)
   target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
   if (MSVC_VERSION LESS 1928) # Visual Studio 2019 version 16.8 claims full C11 support
diff --git a/src/config/HYPREConfig.cmake.in b/src/config/HYPREConfig.cmake.in
index abf6a99bfd..717ba85c10 100644
--- a/src/config/HYPREConfig.cmake.in
+++ b/src/config/HYPREConfig.cmake.in
@@ -45,6 +45,7 @@ set(HYPRE_WITH_UMPIRE_HOST @HYPRE_WITH_UMPIRE_HOST@)
 set(HYPRE_WITH_UMPIRE_DEVICE @HYPRE_WITH_UMPIRE_DEVICE@)
 set(HYPRE_WITH_UMPIRE_UM @HYPRE_WITH_UMPIRE_UM@)
 set(HYPRE_WITH_UMPIRE_PINNED @HYPRE_WITH_UMPIRE_PINNED@)
+set(HYPRE_HAVE_MPI_COMM_F2C @HYPRE_HAVE_MPI_COMM_F2C@)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
diff --git a/src/config/HYPRE_config.h.cmake.in b/src/config/HYPRE_config.h.cmake.in
index 21fcc5bf6b..9f4278dac0 100644
--- a/src/config/HYPRE_config.h.cmake.in
+++ b/src/config/HYPRE_config.h.cmake.in
@@ -155,7 +155,8 @@
 /* Use MPI */
 #cmakedefine HYPRE_HAVE_MPI 1
 
-/* #undef HYPRE_HAVE_MPI_COMM_F2C */
+/* Use MPI_Comm_f2c */
+#cmakedefine HYPRE_HAVE_MPI_COMM_F2C 1
 
 /* Define as follows to set the Fortran name mangling scheme:
  * 0 = unspecified