blt updates

LLNL · Apr 15, 2021 · eb0bce1 · eb0bce1
1 parent f0ecdb5
commit eb0bce1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/blt b/src/blt
diff --git a/src/cmake/SetupBLT.cmake b/src/cmake/SetupBLT.cmake
@@ -28,7 +28,7 @@ endif()
 # if using newer CMake, prefer using MPI as imported targets
 ################################################################
 if( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15.0" )
-    set(BLT_USE_MPI_IMPORTED_TARGETS TRUE CACHE BOOL "")
+    set(BLT_USE_FIND_MPI_TARGETS TRUE CACHE BOOL "")
 endif()
 
 

diff --git a/src/config/conduit_setup_deps.cmake b/src/config/conduit_setup_deps.cmake
@@ -142,6 +142,21 @@ if(CONDUIT_HDF5_DIR)
         list(REMOVE_ITEM HDF5_LIBRARIES ${HDF5_HL_LIB})
     endif()
 
+    message(STATUS "HDF5 is parallel:  ${HDF5_IS_PARALLEL}")
+    # if HDF5 was built with parallel support, we need to find MPI
+    # to make sure the targets propgate correctly.
+    # in other cases, folks will 
+    if(HDF5_IS_PARALLEL AND NOT MPI_FOUND)
+        find_package(MPI)
+    endif()
+
+    if(HDF5_IS_PARALLEL)
+        if(NOT MPI_FOUND)
+             MESSAGE(FATAL_ERROR "Cannot find MPI, but the HDF5 Conduit is linked to requires MPI support."
+                                 " (HDF5_IS_PARALLEL == TRUE). ")
+        endif()
+    endif()
+
 else()
     message(STATUS "Conduit was NOT built with HDF5 Support")
 endif()