3 files changed, 17 insertions, 31 deletions
diff --git a/HDF5Examples/config/cmake-presets/hidden-presets.json b/HDF5Examples/config/cmake-presets/hidden-presets.json
index 8b7f71b..590e7ec 100644
--- a/HDF5Examples/config/cmake-presets/hidden-presets.json
+++ b/HDF5Examples/config/cmake-presets/hidden-presets.json
@@ -357,37 +357,25 @@
       "configurePreset": "ci-x64-Release-MSVC",
       "hidden": true,
       "inherits": "ci-base",
-      "generators": [
-        "ZIP"
-      ],
       "configurations": ["RelWithDebInfo"]
     },
     {
       "name": "ci-x64-Release-Clang",
       "configurePreset": "ci-x64-Release-Clang",
       "hidden": true,
-      "inherits": "ci-base",
-      "generators": [
-        "TGZ"
-      ]
+      "inherits": "ci-base"
     },
     {
       "name": "ci-x64-Release-GNUC",
       "configurePreset": "ci-x64-Release-GNUC",
       "hidden": true,
-      "inherits": "ci-base",
-      "generators": [
-        "TGZ"
-      ]
+      "inherits": "ci-base"
     },
     {
       "name": "ci-x64-Release-Intel",
       "configurePreset": "ci-x64-Release-Intel",
       "hidden": true,
-      "inherits": "ci-base",
-      "generators": [
-        "TGZ"
-      ]
+      "inherits": "ci-base"
     }
   ]
 }
diff --git a/HDF5Examples/config/cmake/HDFExampleMacros.cmake b/HDF5Examples/config/cmake/HDFExampleMacros.cmake
index 245003c..5c425db 100644
--- a/HDF5Examples/config/cmake/HDFExampleMacros.cmake
+++ b/HDF5Examples/config/cmake/HDFExampleMacros.cmake
@@ -132,18 +132,6 @@ macro (HDF5_SUPPORT)
     message (STATUS "HDF5 Fortran libs: static:${HDF5_static_Fortran_FOUND} and shared:${HDF5_shared_Fortran_FOUND}")
     message (STATUS "HDF5 Java libs: ${HDF5_Java_FOUND}")
     if (HDF5_FOUND)
-      if (USE_SHARED_LIBS)
-        if (NOT TARGET ${HDF5_NAMESPACE}h5dump-shared)
-          add_executable (${HDF5_NAMESPACE}h5dump-shared IMPORTED)
-        endif ()
-        set (H5EX_HDF5_DUMP_EXECUTABLE $<TARGET_FILE:${HDF5_NAMESPACE}h5dump-shared>)
-      else ()
-        if (NOT TARGET ${HDF5_NAMESPACE}h5dump)
-          add_executable (${HDF5_NAMESPACE}h5dump IMPORTED)
-        endif()
-        set (H5EX_HDF5_DUMP_EXECUTABLE $<TARGET_FILE:${HDF5_NAMESPACE}h5dump>)
-      endif()
-
       if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND)
         #find library from non-dual-binary package
         set (FIND_HDF_COMPONENTS C)
@@ -177,11 +165,21 @@ macro (HDF5_SUPPORT)
         if (USE_SHARED_LIBS AND HDF5_shared_C_FOUND)
           set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_C_SHARED_LIBRARY})
           set (HDF5_LIBRARY_PATH ${PACKAGE_PREFIX_DIR}/lib)
-          set_property (TARGET ${HDF5_NAMESPACE}h5dump-shared PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump-shared")
         else ()
           set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_C_STATIC_LIBRARY})
-          set_property (TARGET ${HDF5_NAMESPACE}h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump")
         endif ()
+        if (HDF5_VERSION VERSION_LESS "1.14.4" AND NOT HDF5_shared_C_FOUND)
+          if (NOT TARGET ${HDF5_NAMESPACE}h5dump-shared)
+            add_executable (${HDF5_NAMESPACE}h5dump-shared IMPORTED)
+          endif ()
+          set (H5EX_HDF5_DUMP_EXECUTABLE $<TARGET_FILE:${HDF5_NAMESPACE}h5dump-shared>)
+        else ()
+          if (NOT TARGET ${HDF5_NAMESPACE}h5dump)
+            add_executable (${HDF5_NAMESPACE}h5dump IMPORTED)
+         endif()
+          set (H5EX_HDF5_DUMP_EXECUTABLE $<TARGET_FILE:${HDF5_NAMESPACE}h5dump>)
+        endif()
+
         if (NOT HDF5_static_Fortran_FOUND AND NOT HDF5_shared_Fortran_FOUND)
           set (HDF_BUILD_FORTRAN OFF CACHE BOOL "Build FORTRAN support" FORCE)
           message (STATUS "HDF5 Fortran libs not found - disable build of Fortran examples")
diff --git a/HDF5Examples/config/cmake/HDFMacros.cmake b/HDF5Examples/config/cmake/HDFMacros.cmake
index 59efbfb..b9ef2df 100644
--- a/HDF5Examples/config/cmake/HDFMacros.cmake
+++ b/HDF5Examples/config/cmake/HDFMacros.cmake
@@ -90,7 +90,7 @@ macro (HDFTEST_COPY_FILE src dest target)
 endmacro ()
 
 macro (HDF_DIR_PATHS package_prefix)
-	option (H5EX_USE_GNU_DIRS "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" OFF)
+  option (H5EX_USE_GNU_DIRS "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" OFF)
   if (H5EX_USE_GNU_DIRS)
     include(GNUInstallDirs)
     if (NOT ${package_prefix}_INSTALL_BIN_DIR)
@@ -121,7 +121,7 @@ macro (HDF_DIR_PATHS package_prefix)
   endif ()
 
   if (APPLE)
-	  option (${package_prefix}_BUILD_FRAMEWORKS "ON to build as frameworks libraries, OFF to build according to BUILD_SHARED_LIBS" OFF)
+    option (${package_prefix}_BUILD_FRAMEWORKS "ON to build as frameworks libraries, OFF to build according to BUILD_SHARED_LIBS" OFF)
   endif ()
 
   if (NOT ${package_prefix}_INSTALL_BIN_DIR)