Merge branch 'master' into DillUpstream

ornladios · Dec 22, 2022 · 9c08520 · 9c08520
2 parents 6380c77 + 5001279
commit 9c08520
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -385,7 +385,24 @@ if(ADIOS2_USE_SST AND NOT WIN32)
     endif()
   endif()
   if(ADIOS2_HAVE_MPI)
-    set(ADIOS2_SST_HAVE_MPI TRUE)
+    set(CMAKE_REQUIRED_LIBRARIES MPI::MPI_C)
+    include(CheckCSourceRuns)
+    check_c_source_runs([=[
+        #include <mpi.h>
+        #include <stdlib.h>
+
+        #if !defined(MPICH)
+        #error "MPICH is the only supported library"
+        #endif
+
+        int main()
+        {
+          MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, NULL);
+          MPI_Open_port(MPI_INFO_NULL, malloc(sizeof(char) * MPI_MAX_PORT_NAME));
+          MPI_Finalize();
+        }]=]
+    ADIOS2_HAVE_MPI_CLIENT_SERVER)
+    unset(CMAKE_REQUIRED_LIBRARIES)
   endif()
 endif()
 

diff --git a/source/adios2/toolkit/sst/CMakeLists.txt b/source/adios2/toolkit/sst/CMakeLists.txt
@@ -39,7 +39,7 @@ if(ADIOS2_HAVE_ZFP)
   target_link_libraries(sst PRIVATE zfp::zfp)
 endif()
 
-if(ADIOS2_HAVE_MPI)
+if(ADIOS2_HAVE_MPI_CLIENT_SERVER)
   target_sources(sst PRIVATE dp/mpi_dp.c)
   target_link_libraries(sst PRIVATE MPI::MPI_C)
 endif()