Fix Zlib build bad URL, Use FETCHCONTENT_TRY_FIND_PACKAGE_MOD by used

Author: scivision

CMakeLists.txt

@@ -35,7 +35,6 @@ if(h5fortran_ENABLE_RPATH AND NOT WIN32)
 endif()
 
 include(cmake/compilers.cmake)
-include(cmake/CheckHDF5.cmake)
 
 set(CMAKE_Fortran_MODULE_DIRECTORY ${h5fortran_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
 # HDF5 fetchcontent needs this at least for HDF5 2.0.0, 2.1.0, ...
@@ -45,7 +44,7 @@ include(cmake/hdf5.cmake)
 
 set(HDF5_VERSION ${HDF5_VERSION} CACHE STRING "HDF5 version")
 
-if(h5fortran_IS_TOP_LEVEL AND (hdf5_parallel OR HDF5_HAVE_PARALLEL))
+if(h5fortran_IS_TOP_LEVEL AND (hdf5_parallel OR HDF5_IS_PARALLEL))
   target_link_libraries(HDF5::HDF5 INTERFACE MPI::MPI_Fortran)
 endif()
 

CMakePresets.json

@@ -8,15 +8,15 @@
   "cacheVariables": {
     "h5fortran_warning_as_error": true,
     "h5fortran_BUILD_TESTING": true,
-    "h5fortran_find": true,
     "h5fortran_python": true,
     "CMAKE_BUILD_TYPE": "Release"
   }
 },
 { "name": "build", "inherits": "default",
+  "displayName": "Build HDF5 and ZLib from source with h5fortran",
   "cacheVariables": {
     "h5fortran_BUILD_TESTING": false,
-    "h5fortran_find": false
+    "FETCHCONTENT_TRY_FIND_PACKAGE_MODE": "NEVER"
   }
 },
 { "name": "debug", "inherits": "default",
@@ -28,7 +28,7 @@
 {
   "name": "reldebug", "inherits": "default",
   "binaryDir": "build",
-  "displayName": "release with debug info",
+  "displayName": "Release with Debug Info",
   "cacheVariables": {
     "CMAKE_BUILD_TYPE": "RelWithDebInfo"
   }
@@ -39,15 +39,7 @@
   "cacheVariables": {
     "BUILD_SHARED_LIBS": true,
     "h5fortran_ENABLE_RPATH": true,
-    "h5fortran_find": false
-  }
-},
-{
-  "name": "nofind", "inherits": "reldebug",
-  "binaryDir": "build-nofind",
-  "displayName": "don't find HDF5 or Zlib",
-  "cacheVariables": {
-    "h5fortran_find": false
+    "FETCHCONTENT_TRY_FIND_PACKAGE_MODE": "NEVER"
   }
 },
 {
@@ -64,7 +56,6 @@
 "buildPresets": [
   { "name": "default", "configurePreset": "default", "jobs": 0 },
   { "name": "build", "configurePreset": "build", "inherits": "default" },
-  { "name": "nofind",  "configurePreset": "nofind", "inherits": "default" },
   { "name": "shared",  "configurePreset": "shared", "inherits": "default" },
   {
     "name": "explain",
@@ -81,7 +72,6 @@
     "configurePreset": "default",
     "nativeToolOptions": ["-d", "stats"]
   },
-  { "name": "release","configurePreset": "default" },
   {
     "name": "reldebug",
     "configurePreset": "reldebug",
@@ -111,9 +101,7 @@
     "timeout": 60
   }
 },
-{ "name": "nofind", "configurePreset": "nofind", "inherits": "default" },
 { "name": "shared", "configurePreset": "shared", "inherits": "default" },
-{ "name": "release", "inherits": "default" },
 {
   "name": "reldebug", "inherits": "default",
   "configurePreset": "reldebug",
@@ -124,6 +112,7 @@
 "workflowPresets": [
   {
     "name": "default",
+    "displayName": "Build and Test in Release mode",
     "steps": [
       { "type": "configure", "name": "default" },
       { "type": "build", "name": "default" },
@@ -132,13 +121,15 @@
   },
   {
     "name": "build",
+    "displayName": "Build HDF5 and ZLib from source with h5fortran",
     "steps": [
       { "type": "configure", "name": "build" },
       { "type": "build", "name": "build" }
     ]
   },
   {
     "name": "debug",
+    "displayName": "Build and Test in Debug mode",
     "steps": [
       { "type": "configure", "name": "debug" },
       { "type": "build", "name": "debug" },
@@ -147,35 +138,21 @@
   },
   {
     "name": "reldebug",
+    "displayName": "Build and Test in Release with Debug Info mode",
     "steps": [
       { "type": "configure", "name": "reldebug" },
       { "type": "build", "name": "reldebug" },
       { "type": "test", "name": "reldebug" }
     ]
   },
-  {
-    "name": "release",
-    "steps": [
-      { "type": "configure", "name": "default" },
-      { "type": "build", "name": "release" },
-      { "type": "test", "name": "release" }
-    ]
-  },
   {
     "name": "shared",
+    "displayName": "Build and Test shared libraries",
     "steps": [
       { "type": "configure", "name": "shared" },
       { "type": "build", "name": "shared" },
       { "type": "test", "name": "shared" }
     ]
-  },
-  {
-    "name": "nofind",
-    "steps": [
-      { "type": "configure", "name": "nofind" },
-      { "type": "build", "name": "nofind" },
-      { "type": "test", "name": "nofind" }
-    ]
   }
 ]
 }

README.md

@@ -112,7 +112,7 @@ cmake --workflow build
 Optionally, set the version of HDF5 to build with h5fortran_hdf5_req (see cmake/libraries.json), for example:
 
 ```sh
-cmake -B build -Dh5fortran_find=false -Dh5fortran_hdf5_req=2.1
+cmake -B build -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=NEVER -Dh5fortran_hdf5_req=2.1
 ```
 
 see [cmake/libraries.json](./cmake/libraries.json) for supported HDF5 versions.

cmake/CheckHDF5.cmake

@@ -29,7 +29,7 @@ Result Variables
 ``HDF5_<lang>_COMPILER_EXECUTABLE``
   wrapper compiler for HDF5
 
-``HDF5_HAVE_PARALLEL``
+``HDF5_IS_PARALLEL``
   HDF5 links the MPI library (thus user program must link MPI as well)
 
 Components
@@ -130,11 +130,11 @@ check_symbol_exists(H5_HAVE_FILTER_SZIP ${h5_conf} hdf5_have_szip)
 check_symbol_exists(H5_HAVE_FILTER_DEFLATE ${h5_conf} hdf5_have_zlib)
 
 # Always check for HDF5 MPI support because HDF5 link fails if MPI is linked into HDF5.
-check_symbol_exists(H5_HAVE_PARALLEL ${h5_conf} HDF5_HAVE_PARALLEL)
+check_symbol_exists(H5_HAVE_PARALLEL ${h5_conf} HDF5_IS_PARALLEL)
 
 set(HDF5_parallel_FOUND false)
 
-if(HDF5_HAVE_PARALLEL)
+if(HDF5_IS_PARALLEL)
   find_mpi()
   if(NOT MPI_FOUND)
     return()