FindHDF5: check MPI source no separate source file

Author: scivision

CMakeLists.txt

@@ -63,7 +63,6 @@ endif()
 install(FILES
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindHDF5.cmake
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/check_hdf5_mpi.f90
-${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindSZIP.cmake
 DESTINATION cmake
 )
 

cmake/Modules/FindHDF5.cmake

@@ -179,21 +179,27 @@ if(hdf5_have_zlib)
     # Szip even though not used by default.
     # If system HDF5 dynamically links libhdf5 with szip, our builds will fail if we don't also link szip.
     # however, we don't require SZIP for this case as other HDF5 libraries may statically link SZIP.
-    if(NOT SZIP_ROOT)
-      set(SZIP_ROOT ${ZLIB_ROOT})
-    endif()
-    if(HDF5_FIND_REQUIRED)
-      find_package(SZIP REQUIRED)
-    else()
-      find_package(SZIP)
-    endif()
-    if(NOT SZIP_FOUND)
+
+    find_library(SZIP_LIBRARY
+    NAMES szip sz
+    NAMES_PER_DIR
+    HINTS ${SZIP_ROOT} ${ZLIB_ROOT}
+    DOC "SZIP API"
+    )
+
+    find_path(SZIP_INCLUDE_DIR
+    NAMES szlib.h
+    HINTS ${SZIP_ROOT} ${ZLIB_ROOT}
+    DOC "SZIP header"
+    )
+
+    if(NOT SZIP_LIBRARY AND SZIP_INCLUDE_DIR)
       set(hdf5_prereqs false PARENT_SCOPE)
       return()
     endif()
 
-    list(APPEND CMAKE_REQUIRED_INCLUDES ${SZIP_INCLUDE_DIRS})
-    list(APPEND CMAKE_REQUIRED_LIBRARIES ${SZIP_LIBRARIES})
+    list(APPEND CMAKE_REQUIRED_INCLUDES ${SZIP_INCLUDE_DIR})
+    list(APPEND CMAKE_REQUIRED_LIBRARIES ${SZIP_LIBRARY})
   endif()
 
   list(APPEND CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS})
@@ -707,13 +713,20 @@ if(HDF5_parallel_FOUND)
   list(APPEND CMAKE_REQUIRED_INCLUDES ${MPI_Fortran_INCLUDE_DIRS})
   list(APPEND CMAKE_REQUIRED_LIBRARIES ${MPI_Fortran_LIBRARIES})
 
-  set(test_h5fn ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/check_hdf5_mpi.f90)
-
-  if(NOT EXISTS ${test_h5fn})
-    message(WARNING "FindHDF5 could not find ${test_h5fn}")
-    return()
-  endif()
-  file(READ ${test_h5fn} src)
+  set(src "program test
+  use hdf5
+  use mpi
+  implicit none
+  integer :: ierr, mpi_id
+  integer(HID_T) :: fapl, xfer_id
+  call mpi_init(ierr)
+  call h5open_f(ierr)
+  call h5pcreate_f(H5P_FILE_ACCESS_F, fapl, ierr)
+  call h5pset_fapl_mpio_f(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, ierr)
+  call h5pcreate_f(H5P_DATASET_XFER_F, xfer_id, ierr)
+  call h5pset_dxpl_mpio_f(xfer_id, H5FD_MPIO_COLLECTIVE_F, ierr)
+  call mpi_finalize(ierr)
+  end program")
 else()
   set(src "program test_minimal
   use hdf5, only : h5open_f, h5close_f
@@ -887,12 +900,16 @@ if(HDF5_FOUND)
   if(NOT TARGET HDF5::HDF5)
     add_library(HDF5::HDF5 INTERFACE IMPORTED)
     set_target_properties(HDF5::HDF5 PROPERTIES
-      INTERFACE_LINK_LIBRARIES "${HDF5_LIBRARIES}"
-      INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}")
+    INTERFACE_LINK_LIBRARIES "${HDF5_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}"
+    )
 
+    target_include_directories(HDF5::HDF5 INTERFACE
+    $<$<BOOL:${hdf5_have_szip}>:${SZIP_INCLUDE_DIR}>
+    )
     target_link_libraries(HDF5::HDF5 INTERFACE
     $<$<BOOL:${hdf5_have_zlib}>:ZLIB::ZLIB>
-    $<$<BOOL:${hdf5_have_szip}>:SZIP::SZIP>
+    $<$<BOOL:${hdf5_have_szip}>:${SZIP_LIBRARY}>
     ${CMAKE_THREAD_LIBS_INIT}
     ${CMAKE_DL_LIBS}
     $<$<BOOL:${UNIX}>:m>

cmake/Modules/FindSZIP.cmake

@@ -8,7 +8,7 @@ set(CMAKE_TLS_VERIFY true)
 
 
 if(BUILD_SHARED_LIBS)
-  if(WIN32 AND CMAKE_VERSION VERSION_LESS 3.21 AND BUILD_TESTING)
+  if(WIN32 AND CMAKE_VERSION VERSION_LESS 3.21 AND ${PROJECT_NAME}_BUILD_TESTING)
     message(STATUS "Windows with shared libs needs CMake >= 3.21 to run tests")
   endif()
   if(MSVC)