fix Zlib build bug introduced in b864867

Author: scivision

cmake/hdf5.cmake

@@ -38,15 +38,18 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/libraries.json json)
 # --- Zlib
 if(build_zlib)
   set(zlib_dep DEPENDS ZLIB)
-  if(TARGET ZLIB::ZLIB)
-    add_custom_target(ZLIB)
-  else()
-    include(${CMAKE_CURRENT_LIST_DIR}/zlib.cmake)
-  endif()
 else()
   set(zlib_dep)
 endif()
 
+if(TARGET ZLIB::ZLIB)
+  add_custom_target(ZLIB)
+elseif(h5fortran_find)
+  find_package(ZLIB)
+else()
+  include(${CMAKE_CURRENT_LIST_DIR}/zlib.cmake)
+endif()
+
 # --- HDF5
 # https://forum.hdfgroup.org/t/issues-when-using-hdf5-as-a-git-submodule-and-using-cmake-with-add-subdirectory/7189/2
 

cmake/zlib.cmake

@@ -3,6 +3,10 @@
 include(GNUInstallDirs)
 include(ExternalProject)
 
+if(NOT DEFINED zlib_key)
+  set(zlib_key zlib2)
+endif()
+
 if(NOT zlib_url)
 string(JSON zlib_url GET ${json} ${zlib_key})
 endif()