default HDF5 1.12.2

Author: scivision

cmake/hdf5.cmake

@@ -4,14 +4,6 @@
 
 include(ExternalProject)
 
-if(NOT HDF5_VERSION)
-  set(HDF5_VERSION 1.12.1 CACHE STRING "HDF5 version built")
-endif()
-
-string(JSON hdf5_url GET ${json} hdf5 ${HDF5_VERSION} url)
-string(JSON hdf5_sha256 GET ${json} hdf5 ${HDF5_VERSION} sha256)
-
-
 if(hdf5_parallel)
   find_package(MPI REQUIRED COMPONENTS C)
 endif()
@@ -71,14 +63,20 @@ if(MPI_ROOT)
   list(APPEND hdf5_cmake_args -DMPI_ROOT:PATH=${MPI_ROOT})
 endif()
 
+string(JSON hdf5_url GET ${json} hdf5 url)
+if(NOT hdf5_tag)
+  string(JSON hdf5_tag GET ${json} hdf5 tag)
+endif()
+
 ExternalProject_Add(HDF5
-URL ${hdf5_url}
-URL_HASH SHA256=${hdf5_sha256}
+GIT_REPOSITORY ${hdf5_url}
+GIT_TAG ${hdf5_tag}
+GIT_SHALLOW true
 CMAKE_ARGS ${hdf5_cmake_args}
 BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
 DEPENDS ZLIB::ZLIB
 CONFIGURE_HANDLED_BY_BUILD ON
-INACTIVITY_TIMEOUT 15
+INACTIVITY_TIMEOUT 60
 )
 
 # --- imported target

cmake/libraries.json

@@ -14,29 +14,15 @@
     "tag": "v1.2.3"
   },
   "zlib1": {
-    "url": "https://zlib.net/zlib1211.zip",
-    "sha256": "d7510a8ee1918b7d0cad197a089c0a2cd4d6df05fee22389f67f115e738b178d"
+    "url": "http://zlib.net/zlib-1.2.12.tar.xz",
+    "sha256": "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
   },
   "zlib2": {
-    "url" : "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.6.tar.gz",
-    "sha256": "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6"
+    "url" : "https://github.com/zlib-ng/zlib-ng.git",
+    "tag": "2.0.6"
   },
   "hdf5": {
-    "1.13.0": {
-      "url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_13_0.tar.gz",
-      "sha256": "71ea4747e7362e27e925b67d1dea868bebedd599903f371ccd73949b6a805493"
-    },
-    "1.12.1": {
-    "url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_12_1.tar.gz",
-    "sha256": "e6dde173c2d243551922d23a0387a79961205b018502e6a742acb30b61bc2d5f"
-    },
-    "1.10.8": {
-     "url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_10_8.tar.gz",
-     "sha256": "6fcaf2e5f10bb758d2d5fafa7bd0fd560d4047faf6b397fe1278c06e4e9f3564"
-     },
-   "1.10.7": {
-    "url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_10_7.tar.gz",
-    "sha256": "a1b7c2a477090508365d79bb1356d995a90d5c75e9e3ff0f2bd09d54d8a225d0"
-    }
+    "url": "https://github.com/HDFGroup/hdf5.git",
+    "tag": "hdf5-1_12_2"
   }
 }

cmake/libraries_hdf5.cmake

@@ -8,7 +8,7 @@ if(zlib_legacy)
   string(JSON zlib_sha256 GET ${json} zlib1 sha256)
 else()
   string(JSON zlib_url GET ${json} zlib2 url)
-  string(JSON zlib_sha256 GET ${json} zlib2 sha256)
+  string(JSON zlib_tag GET ${json} zlib2 tag)
 endif()
 
 
@@ -37,6 +37,7 @@ set(zlib_cmake_args
 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
 )
 
+if(zlib_legacy)
 ExternalProject_Add(ZLIB
 URL ${zlib_url}
 URL_HASH SHA256=${zlib_sha256}
@@ -45,6 +46,17 @@ BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
 CONFIGURE_HANDLED_BY_BUILD ON
 INACTIVITY_TIMEOUT 15
 )
+else()
+ExternalProject_Add(ZLIB
+GIT_REPOSITORY ${zlib_url}
+GIT_TAG ${zlib_tag}
+GIT_SHALLOW true
+CMAKE_ARGS ${zlib_cmake_args}
+BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
+CONFIGURE_HANDLED_BY_BUILD ON
+INACTIVITY_TIMEOUT 15
+)
+endif()
 
 # --- imported target
 

cmake/zlib.cmake

@@ -1,13 +1,10 @@
-cmake_minimum_required(VERSION 3.20...3.23)
+cmake_minimum_required(VERSION 3.20)
 project(HDF5_build
 LANGUAGES C Fortran
 )
 
 option(hdf5_parallel "build HDF5 parallel MPI" on)
-
-if(NOT HDF5_VERSION)
-  set(HDF5_VERSION 1.12.1)  # default version to build
-endif()
+option(zlib_legacy "use legacy zlib 1.x")
 
 # --- system checks
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -61,8 +58,6 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/libraries.json json)
 
 set_directory_properties(PROPERTIES EP_UPDATE_DISCONNECTED true)
 
-message(STATUS "Build / install HDF5 ${HDF5_VERSION} to ${CMAKE_INSTALL_PREFIX}")
-
 if(hdf5_parallel)
   find_package(MPI COMPONENTS C REQUIRED)
   include(${PROJECT_SOURCE_DIR}/../cmake/check_mpi.cmake)
@@ -71,6 +66,8 @@ endif()
 
 include(${PROJECT_SOURCE_DIR}/../cmake/hdf5.cmake)
 
+message(STATUS "Build / install HDF5 ${hdf5_tag} to ${CMAKE_INSTALL_PREFIX}")
+
 # --- features
 include(FeatureSummary)