Tidy MPI CMake

hemelb-codes · Dec 20, 2023 · 2bf633b · 2bf633b
1 parent 4cc9e11
commit 2bf633b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
@@ -55,8 +55,11 @@ include(platform_checks)
 include(codesign)
 include(HemeLbDependency)
 
+# We do NOT want the removed MPI 2 C++ bindings
+# Requesting MPI 3 should be enough, but some configurations of
+# e.g. OpenMPI enable them for C++ by default to be "helpful".
 set(MPI_CXX_SKIP_MPICXX ON)
-find_package(MPI REQUIRED CXX)
+find_package(MPI 3 REQUIRED CXX)
 
 find_hemelb_dependency(Boost REQUIRED)
 find_hemelb_dependency(tinyxml2 REQUIRED)
@@ -65,6 +68,8 @@ find_hemelb_dependency(CTemplate REQUIRED)
 find_hemelb_dependency(ZLIB REQUIRED)
 
 # MPI and boost should always be available
+# Note this is NOT the C++ bindings, this is the C bindings from C++
+# (ensures helpful MPI implementations do not sneak the MPI 2 C++ bindings back in)
 link_libraries(MPI::MPI_CXX)
 link_libraries(Boost::headers)
 

diff --git a/Code/cmake/mpi.cmake b/Code/cmake/mpi.cmake