json: simplify url specification

Author: scivision

cmake/hdf5.cmake

@@ -4,6 +4,10 @@
 include(GNUInstallDirs)
 include(ExternalProject)
 
+if(NOT DEFINED hdf5_key)
+  set(hdf5_key hdf5-1.10)
+endif()
+
 if(hdf5_parallel)
   find_package(MPI REQUIRED COMPONENTS C)
 endif()
@@ -74,7 +78,7 @@ if(MPI_ROOT)
 endif()
 
 if(NOT hdf5_url)
-  string(JSON hdf5_url GET ${json} hdf5 url)
+  string(JSON hdf5_url GET ${json} ${hdf5_key})
 endif()
 
 # Get HDF5 version from underscore-separated version in URL

cmake/libraries.json

@@ -1,11 +1,6 @@
 {
-  "zlib1": {
-    "url": "https://zlib.net/zlib-1.3.1.tar.gz"
-  },
-  "zlib2": {
-    "url" : "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.3.tar.gz"
-  },
-  "hdf5": {
-    "url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_10_11.tar.gz"
-  }
+  "zlib1": "https://zlib.net/zlib-1.3.1.tar.gz",
+  "zlib2": "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.3.tar.gz",
+  "hdf5-1.10": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_10_11.tar.gz",
+  "hdf5-1.14": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.5.tar.gz"
 }

cmake/zlib.cmake

@@ -4,11 +4,7 @@ include(GNUInstallDirs)
 include(ExternalProject)
 
 if(NOT zlib_url)
-if(zlib_legacy)
-  string(JSON zlib_url GET ${json} zlib1 url)
-else()
-  string(JSON zlib_url GET ${json} zlib2 url)
-endif()
+string(JSON zlib_url GET ${json} ${zlib_key})
 endif()
 
 set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
@@ -20,7 +16,7 @@ if(BUILD_SHARED_LIBS)
     set(ZLIB_LIBRARIES ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
 else()
-  if(MSVC OR (WIN32 AND zlib_legacy))
+  if(MSVC OR (WIN32 AND zlib_key STREQUAL "zlib1"))
     set(ZLIB_LIBRARIES ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX})
   else()
     set(ZLIB_LIBRARIES ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX})

ford.md

@@ -125,10 +125,10 @@ This is necessary to workaround techniques used by HDF5 CMake files that don't p
 Otherwise, HDF5 build failures may result due to defaulting to icl-clang.
 
 By default we use Zlib 2.x a.k.a. zlib-ng.
-If you have a problem with Zlib-ng on your system, try the unmaintained Zlib 1.x by:
+If you have a problem with Zlib-ng on your system, try Zlib 1.x by:
 
 ```sh
-cmake -B build -Dzlib_legacy=on
+cmake -B build -Dzlib_key=zlib1
 ```
 
 ## Usage

scripts/CMakeLists.txt

@@ -6,7 +6,6 @@ LANGUAGES C Fortran
 )
 
 option(hdf5_parallel "build HDF5 parallel MPI")
-option(zlib_legacy "use legacy zlib 1.x")
 option(build_zlib "build zlib")
 
 # --- system checks