FindHDF5: check that all components present before prereqs

Author: scivision

cmake/Modules/FindHDF5.cmake

@@ -44,8 +44,17 @@ URL "https://hdfgroup.org/"
 DESCRIPTION "versatile file format"
 PURPOSE "h5fortran is an object-oriented HDF5 API")
 
+
 function(detect_config)
 
+if(Fortran IN_LIST HDF5_FIND_COMPONENTS AND NOT HDF5_Fortran_FOUND)
+  return()
+endif()
+
+if(CXX IN_LIST HDF5_FIND_COMPONENTS AND NOT HDF5_CXX_FOUND)
+  return()
+endif()
+
 set(CMAKE_REQUIRED_INCLUDES ${HDF5_INCLUDE_DIR})
 
 foreach(f H5pubconf.h H5pubconf-64.h)
@@ -79,6 +88,10 @@ if( "${_def}" MATCHES
   set(HDF5_VERSION ${HDF5_VERSION} PARENT_SCOPE)
 endif()
 
+if(PkgConfig_FOUND)
+  pkg_search_module(pc_zlib zlib)
+endif()
+
 # otherwise can pickup miniconda zlib
 get_filename_component(_hint ${HDF5_C_LIBRARY} DIRECTORY)
 if(NOT ZLIB_ROOT)
@@ -127,11 +140,9 @@ set(_psuf static ${_lsuf})
 
 # we don't use pkg-config directly because some distros pkg-config for HDF5 is broken
 # however at least the paths are often correct
-
 find_package(PkgConfig)
 if(PkgConfig_FOUND)
   pkg_search_module(pc_hdf5 hdf5 hdf5-serial)
-  pkg_search_module(pc_zlib zlib)
 endif()
 
 if(Fortran IN_LIST HDF5_FIND_COMPONENTS)

cmake/build_hdf5.cmake

@@ -21,13 +21,8 @@ set(HDF5_INCLUDE_DIRS ${HDF5_ROOT}/include)
 # --- Zlib
 set(zlib_root -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON -DZLIB_USE_EXTERNAL:BOOL=OFF)
 
-if(TARGET ZLIB::ZLIB)
-  get_property(ZLIB_ROOT TARGET ZLIB::ZLIB PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-  list(APPEND zlib_root -DZLIB_ROOT:PATH=${ZLIB_ROOT} -DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARIES} -DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIRS})
-  add_custom_target(ZLIB)  # dummy
-else()
-  include(${CMAKE_CURRENT_LIST_DIR}/zlib_setup.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/zlib_setup.cmake)
+
 # --- HDF5
 # https://forum.hdfgroup.org/t/issues-when-using-hdf5-as-a-git-submodule-and-using-cmake-with-add-subdirectory/7189/2