Merge remote-tracking branch 'canonical/develop' into feature/onion_vfd

20 files changed, 372 insertions, 427 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index f958804..9517e4b 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -19,6 +19,8 @@ set (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 50000)
 set (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
     "note.*expected.*void.*but argument is of type.*volatile"
+    "plugin-build.*:[ \t]*warning"
+    "CMake Warning*stamp"
     "src.ZLIB.*:[ \t]*warning"
     "warning LNK4197:.*ZLIB-prefix"
     "src.SZIP.*:[ \t]*warning"
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 263cedf..43aa243 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -30,7 +30,7 @@ MARK_AS_ADVANCED (HDF5_STRICT_FORMAT_CHECKS)
 
 # ----------------------------------------------------------------------
 # Decide whether the data accuracy has higher priority during data
-# conversions.  If not, some hard conversions will still be prefered even
+# conversions.  If not, some hard conversions will still be preferred even
 # though the data may be wrong (for example, some compilers don't
 # support denormalized floating values) to maximize speed.
 #-----------------------------------------------------------------------------
@@ -195,7 +195,7 @@ endif ()
 # Header-check flags set in config/cmake_ext_mod/ConfigureChecks.cmake
 # ----------------------------------------------------------------------
 option (HDF5_ENABLE_MIRROR_VFD "Build the Mirror Virtual File Driver" OFF)
-if (H5FD_ENABLE_MIRROR_VFD)
+if (HDF5_ENABLE_MIRROR_VFD)
   if ( ${HDF_PREFIX}_HAVE_NETINET_IN_H AND
        ${HDF_PREFIX}_HAVE_NETDB_H      AND
        ${HDF_PREFIX}_HAVE_ARPA_INET_H  AND
@@ -232,7 +232,7 @@ endif ()
 # so this one is used.
 #-----------------------------------------------------------------------------
 set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
-macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
+macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR RETURN_OUTPUT_VAR)
     if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
       message (VERBOSE "Detecting C ${FUNCTION_NAME}")
     endif ()
@@ -248,7 +248,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
         RUN_OUTPUT_VARIABLE OUTPUT_VAR
     )
 
-    set (${RETURN_VAR} ${OUTPUT_VAR})
+    set (${RETURN_OUTPUT_VAR} ${OUTPUT_VAR})
 
     if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
       message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
@@ -304,12 +304,11 @@ set (PROG_SRC
 #define C_LDBL_DIG DECIMAL_DIG\n\
 #else\n\
 #define C_LDBL_DIG LDBL_DIG\n\
-#endif\n\nint main() {\nFILE *pFile = fopen(\"pac_Cconftest.out\",\"w\")\\\;\nfprintf(pFile, \"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
+#endif\n\nint main() {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
      "
 )
 
-C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_RES)
-file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_Cconftest.out" PROG_OUTPUT4)
+C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_RES PROG_OUTPUT4)
 message (STATUS "Testing maximum decimal precision for C - ${PROG_OUTPUT4}")
 
 # dnl The output from the above program will be:
diff --git a/config/cmake/FindCIRCLE.cmake b/config/cmake/FindCIRCLE.cmake
new file mode 100644
index 0000000..b36d76c
--- /dev/null
+++ b/config/cmake/FindCIRCLE.cmake
@@ -0,0 +1,49 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindCIRCLE
+--------
+
+Find the native CIRCLE includes and library
+
+This module defines
+
+::
+
+  CIRCLE_INCLUDE_DIR, where to find CIRCLE.h, etc.
+  CIRCLE_LIBRARIES, the libraries required to use CIRCLE.
+  CIRCLE_FOUND, If false, do not try to use CIRCLE.
+
+also defined, but not for general use are
+
+::
+
+  CIRCLE_LIBRARY, where to find the CIRCLE library.
+#]=======================================================================]
+
+if(DEFINED ENV{MFU_ROOT})
+  set(ENV{MFU_INCLUDE} "$ENV{MFU_ROOT}/include")
+  set(ENV{MFU_LIB} "$ENV{MFU_ROOT}/lib")
+  set(ENV{MFU_LIB64} "$ENV{MFU_ROOT}/lib64")
+else()
+  message("CIRCLE_LIBRARY: If you have problems building this library,\nconsider setting the MFU_ROOT environment variable to indicate\nwhere to find the support libraries and header files!")
+endif()
+
+find_path(CIRCLE_INCLUDE_DIR
+  NAMES libcircle.h
+  HINTS ENV MFU_INCLUDE)
+
+find_library(CIRCLE_LIBRARY
+  NAMES circle
+  HINTS ENV MFU_LIB ENV MFU_LIB64
+  )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CIRCLE REQUIRED_VARS CIRCLE_LIBRARY CIRCLE_INCLUDE_DIR)
+
+if(CIRCLE_FOUND)
+  set(CIRCLE_LIBRARIES ${CIRCLE_LIBRARY} )
+endif()
+
+mark_as_advanced(CIRCLE_INCLUDE_DIR CIRCLE_LIBRARY)
diff --git a/config/cmake/FindDTCMP.cmake b/config/cmake/FindDTCMP.cmake
new file mode 100644
index 0000000..b95ef20
--- /dev/null
+++ b/config/cmake/FindDTCMP.cmake
@@ -0,0 +1,48 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindDTCMP
+--------
+
+Find the native DTCMP includes and library
+
+This module defines
+
+::
+
+  DTCMP_INCLUDE_DIR, where to find DTCMP.h, etc.
+  DTCMP_LIBRARIES, the libraries required to use DTCMP.
+  DTCMP_FOUND, If false, do not try to use DTCMP.
+
+also defined, but not for general use are
+
+::
+
+  DTCMP_LIBRARY, where to find the DTCMP library.
+#]=======================================================================]
+
+if(DEFINED ENV{MFU_ROOT})
+  set(ENV{MFU_INCLUDE} "$ENV{MFU_ROOT}/include")
+  set(ENV{MFU_LIB} "$ENV{MFU_ROOT}/lib")
+  set(ENV{MFU_LIB64} "$ENV{MFU_ROOT}/lib64")
+else()
+  message("DTCMP_LIBRARY: If you have problems building this library,\nconsider setting the MFU_ROOT environment variable to indicate\nwhere to find the support libraries and header files!")
+endif()
+
+find_path(DTCMP_INCLUDE_DIR
+  NAMES dtcmp.h
+  HINTS ENV MFU_INCLUDE)
+
+find_library(DTCMP_LIBRARY
+  NAMES dtcmp
+  HINTS ENV MFU_LIB ENV MFU_LIB64)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DTCMP REQUIRED_VARS DTCMP_LIBRARY DTCMP_INCLUDE_DIR)
+
+if(DTCMP_FOUND)
+  set(DTCMP_LIBRARIES ${DTCMP_LIBRARY} )
+endif()
+
+mark_as_advanced(DTCMP_INCLUDE_DIR DTCMP_LIBRARY)
diff --git a/config/cmake/FindMFU.cmake b/config/cmake/FindMFU.cmake
new file mode 100644
index 0000000..37699e2
--- /dev/null
+++ b/config/cmake/FindMFU.cmake
@@ -0,0 +1,100 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#########################################################################
+
+# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
+# FindMFU
+
+# Find the native MFU includes and library
+
+# Imported targets
+##################
+
+# This module defines the following :prop_tgt:`IMPORTED` targets:
+#
+# MFU::MFU
+#  The MFU library, if found.
+#
+# Result variables
+###################
+
+# This module will set the following variables in your project:
+
+#  MFU_FOUND, true if the MFU headers and libraries were found.
+#  MFU_INCLUDE_DIR, the directory containing the MFU headers.
+#  MFU_INCLUDE_DIRS, the directory containing the MFU headers.
+#  MFU_LIBRARIES, libraries to link against to use MFU.
+
+# Cache variables
+#################
+
+# The following variables may also be set:
+
+#  MFU_LIBRARY, where to find the MFU library.
+# message (STATUS "Finding MFU library and headers..." )
+#########################################################################
+
+
+
+FIND_PATH(MFU_INCLUDE_DIR
+  NAMES mfu.h
+  HINTS "$ENV{MFU_ROOT}/include"
+)
+FIND_LIBRARY(MFU_LIBRARY
+  NAMES mfu
+  HINTS "$ENV{MFU_ROOT}/lib64"
+)
+
+if(NOT MFU_LIBRARY)
+  set(mfu_names ${MFU_NAMES} mfu libmfu)
+  find_library(MFU_LIBRARY NAMES ${mfu_names})
+  include(SelectLibraryConfigurations)
+  select_library_configurations(MFU)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MFU
+  REQUIRED_VARS MFU_LIBRARY MFU_INCLUDE_DIR)
+
+if(MFU_FOUND)
+  set(MFU_LIBRARIES "${MFU_LIBRARY}")
+  set(MFU_INCLUDE_DIRS "${MFU_INCLUDE_DIR}")
+  set(LL_PATH "$ENV{MFU_ROOT}/lib64:$ENV{MFU_ROOT}/lib")
+  if(NOT TARGET MFU::MFU)
+    add_library(MFU::MFU UNKNOWN IMPORTED)
+    if(MFU_INCLUDE_DIRS)
+      set_target_properties(MFU::MFU PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${MFU_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${MFU_LIBRARY}")
+      set_target_properties(MFU::MFU PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${MFU_LIBRARY}")
+    endif()
+  endif()
+endif()
+
+# Report the results.
+if (NOT MFU_FOUND)
+  set (MFU_DIR_MESSAGE
+      "Mfu was not found. Make sure MFU_LIBRARY and MFU_INCLUDE_DIR are set or set the MFU_INSTALL environment variable."
+  )
+  if (NOT MFU_FIND_QUIETLY)
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "${MFU_DIR_MESSAGE}")
+    endif ()
+  else ()
+    if (MFU_FIND_REQUIRED)
+      message (FATAL_ERROR "Mfu was NOT found and is Required by this project")
+    endif ()
+  endif ()
+endif ()
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 04c0c9f..4956c97 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -71,13 +71,13 @@
 /* Define Fortran compiler ID */
 #define H5_Fortran_COMPILER_ID @CMAKE_Fortran_COMPILER_ID@
 
+/* Define number of valid Fortran INTEGER KINDs (must be defined before F_IKIND)*/
+#cmakedefine H5_H5CONFIG_F_NUM_IKIND @H5_H5CONFIG_F_NUM_IKIND@
+
 /* Define valid Fortran INTEGER KINDs */
 #cmakedefine H5_H5CONFIG_F_IKIND @H5_H5CONFIG_F_IKIND@
 
-/* Define number of valid Fortran INTEGER KINDs */
-#cmakedefine H5_H5CONFIG_F_NUM_IKIND @H5_H5CONFIG_F_NUM_IKIND@
-
-/* Define number of valid Fortran REAL KINDs */
+/* Define number of valid Fortran REAL KINDs (must be defined before F_RKIND) */
 #cmakedefine H5_H5CONFIG_F_NUM_RKIND @H5_H5CONFIG_F_NUM_RKIND@
 
 /* Define valid Fortran REAL KINDs */
@@ -265,6 +265,9 @@
 /* Define if we have parallel support */
 #cmakedefine H5_HAVE_PARALLEL @H5_HAVE_PARALLEL@
 
+/* Define if we have support for writing to filtered datasets in parallel */
+#cmakedefine H5_HAVE_PARALLEL_FILTERED_WRITES @H5_HAVE_PARALLEL_FILTERED_WRITES@
+
 /* Define if both pread and pwrite exist. */
 #cmakedefine H5_HAVE_PREADWRITE @H5_HAVE_PREADWRITE@
 
@@ -406,6 +409,9 @@
 /* Define if the high-level library headers should be included in hdf5.h */
 #cmakedefine H5_INCLUDE_HL @H5_INCLUDE_HL@
 
+/* Define if new-style references should be used with dimension scales */
+#cmakedefine H5_DIMENSION_SCALES_WITH_NEW_REF @H5_DIMENSION_SCALES_WITH_NEW_REF@
+
 /* Define if your system can convert long double to (unsigned) long long
    values correctly. */
 #cmakedefine H5_LDOUBLE_TO_LLONG_ACCURATE @H5_LDOUBLE_TO_LLONG_ACCURATE@
@@ -660,7 +666,7 @@
 /* Version number of package */
 #define H5_VERSION "@HDF5_PACKAGE_VERSION_STRING@"
 
-/* Data accuracy is prefered to speed during data conversions */
+/* Data accuracy is preferred to speed during data conversions */
 #cmakedefine H5_WANT_DATA_ACCURACY @H5_WANT_DATA_ACCURACY@
 
 /* Check exception handling functions during data conversions */
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 090524a..8b8b334 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -58,5 +58,46 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
       endif ()
     endif ()
   endif ()
+endmacro ()
+
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+macro (H5_SET_VFD_LIST)
+  set (VFD_LIST
+      sec2
+      stdio
+      core
+      core_paged
+      split
+      multi
+      family
+      splitter
+      #log - log VFD currently has file space allocation bugs
+  )
+
+  if (H5_HAVE_DIRECT)
+    set (VFD_LIST ${VFD_LIST} direct)
+  endif ()
+  if (H5_HAVE_PARALLEL)
+    # MPI I/O VFD is currently incompatible with too many tests in the VFD test set
+    # set (VFD_LIST ${VFD_LIST} mpio)
+  endif ()
+  if (H5_HAVE_MIRROR_VFD)
+    set (VFD_LIST ${VFD_LIST} mirror)
+  endif ()
+  if (H5_HAVE_ROS3_VFD)
+    set (VFD_LIST ${VFD_LIST} ros3)
+  endif ()
+  if (H5_HAVE_LIBHDFS)
+    set (VFD_LIST ${VFD_LIST} hdfs)
+  endif ()
+  if (H5_HAVE_WINDOWS)
+    set (VFD_LIST ${VFD_LIST} windows)
+  endif ()
+endmacro ()
 
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+macro (H5_CREATE_VFD_DIR)
+  foreach (vfdtest ${VFD_LIST})
+    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
+  endforeach ()
 endmacro ()
diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake
index 4e05399..dbed15c 100644
--- a/config/cmake/HDF5PluginMacros.cmake
+++ b/config/cmake/HDF5PluginMacros.cmake
@@ -57,8 +57,8 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
       add_dependencies (h5ex_d_mafisc ${HDF5_LIBSH_TARGET})
       target_include_directories (h5ex_d_mafisc PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR}")
     endif ()
-    if (ENABLE_SZF)
-      add_dependencies (h5szf ${HDF5_LIBSH_TARGET})
+    if (ENABLE_SZ)
+      add_dependencies (h5sz ${HDF5_LIBSH_TARGET})
       add_dependencies (h5ex_d_sz ${HDF5_LIBSH_TARGET})
       target_include_directories (h5ex_d_sz PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR}")
     endif ()
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index e192ec4..43e006c 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -32,15 +32,10 @@ macro (READ_SOURCE SOURCE_START SOURCE_END RETURN_VAR)
 endmacro ()
 
 set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  if (HDF5_REQUIRED_LIBRARIES)
-    set (CMAKE_REQUIRED_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}")
-  endif ()
-else ()
 # The provided CMake Fortran macros don't provide a general compile/run function
 # so this one is used.
 #-----------------------------------------------------------------------------
-macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1 RETURN_VAR)
+macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1 RETURN_VAR RETURN_OUTPUT_VAR)
     if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
       message (VERBOSE "Detecting Fortran ${FUNCTION_NAME}")
     endif ()
@@ -52,7 +47,9 @@ macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1
         ${CMAKE_BINARY_DIR}
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler1.f90
         LINK_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}"
+        RUN_OUTPUT_VARIABLE OUTPUT_VAR
     )
+    set (${RETURN_OUTPUT_VAR} ${OUTPUT_VAR})
 
     if (${COMPILE_RESULT_VAR})
       set(${RETURN_VAR} ${RUN_RESULT_VAR})
@@ -81,7 +78,6 @@ macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1
         set(${RETURN_VAR} ${COMPILE_RESULT_VAR})
     endif ()
 endmacro ()
-endif ()
 #-----------------------------------------------------------------------------
 #  Check to see C_LONG_DOUBLE is available
 
@@ -130,27 +126,22 @@ endif ()
 #-----------------------------------------------------------------------------
 
 READ_SOURCE ("PROGRAM FC_AVAIL_KINDS" "END PROGRAM FC_AVAIL_KINDS" SOURCE_CODE)
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  check_fortran_source_runs (${SOURCE_CODE} FC_AVAIL_KINDS_RESULT SRC_EXT f90)
-else ()
 FORTRAN_RUN ("REAL and INTEGER KINDs"
     "${SOURCE_CODE}"
     XX
     YY
     FC_AVAIL_KINDS_RESULT
+    PROG_OUTPUT
 )
-endif ()
-
 # dnl The output from the above program will be:
-# dnl    -- LINE 1 --  valid integer kinds (comma seperated list)
-# dnl    -- LINE 2 --  valid real kinds (comma seperated list)
+# dnl    -- LINE 1 --  valid integer kinds (comma separated list)
+# dnl    -- LINE 2 --  valid real kinds (comma separated list)
 # dnl    -- LINE 3 --  max decimal precision for reals
 # dnl    -- LINE 4 --  number of valid integer kinds
 # dnl    -- LINE 5 --  number of valid real kinds
-
-file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_fconftest.out" PROG_OUTPUT)
+#
 # Convert the string to a list of strings by replacing the carriage return with a semicolon
-string (REGEX REPLACE "\n" ";" PROG_OUTPUT "${PROG_OUTPUT}")
+string (REGEX REPLACE "[\r\n]+" ";" PROG_OUTPUT "${PROG_OUTPUT}")
 
 list (GET PROG_OUTPUT 0 pac_validIntKinds)
 list (GET PROG_OUTPUT 1 pac_validRealKinds)
@@ -196,21 +187,15 @@ foreach (KIND ${VAR})
   "
        PROGRAM main
           USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
           IMPLICIT NONE
           INTEGER (KIND=${KIND}) a
-          OPEN(8,FILE='pac_validIntKinds.${KIND}.out',FORM='formatted')
-          WRITE(8,'(I0)') ${FC_SIZEOF_A}
-          CLOSE(8)
+          WRITE(stderr,'(I0)') ${FC_SIZEOF_A}
        END
    "
   )
-  if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-    check_fortran_source_runs (${PROG_SRC_${KIND}} VALIDINTKINDS_RESULT_${KIND} SRC_EXT f90)
-  else ()
-    FORTRAN_RUN("INTEGER KIND SIZEOF" ${PROG_SRC_${KIND}} XX YY VALIDINTKINDS_RESULT_${KIND})
-  endif ()
-  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validIntKinds.${KIND}.out" PROG_OUTPUT1)
-  string (REGEX REPLACE "\n" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
+  FORTRAN_RUN("INTEGER KIND SIZEOF" ${PROG_SRC_${KIND}} XX YY VALIDINTKINDS_RESULT_${KIND} PROG_OUTPUT1)
+  string (REGEX REPLACE "[\r\n]+" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
   set (pack_int_sizeof "${pack_int_sizeof} ${PROG_OUTPUT1},")
 endforeach ()
 
@@ -245,22 +230,16 @@ foreach (KIND ${VAR} )
   "
        PROGRAM main
           USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
           IMPLICIT NONE
           REAL (KIND=${KIND}) a
-          OPEN(8,FILE='pac_validRealKinds.${KIND}.out',FORM='formatted')
-          WRITE(8,'(I0)') ${FC_SIZEOF_A}
-          CLOSE(8)
+          WRITE(stderr,'(I0)') ${FC_SIZEOF_A}
        END
   "
   )
-  if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-    check_fortran_source_runs (${PROG_SRC2_${KIND}} VALIDREALKINDS_RESULT_${KIND} SRC_EXT f90)
-  else ()
-    FORTRAN_RUN ("REAL KIND SIZEOF" ${PROG_SRC2_${KIND}} XX YY VALIDREALKINDS_RESULT_${KIND})
-  endif ()
-  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validRealKinds.${KIND}.out" PROG_OUTPUT1)
-  string (REGEX REPLACE "\n" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
-  set (pack_real_sizeof "${pack_real_sizeof} ${PROG_OUTPUT1},")
+  FORTRAN_RUN ("REAL KIND SIZEOF" ${PROG_SRC2_${KIND}} XX YY VALIDREALKINDS_RESULT_${KIND} PROG_OUTPUT2)
+  string (REGEX REPLACE "[\r\n]+" "" PROG_OUTPUT2 "${PROG_OUTPUT2}")
+  set (pack_real_sizeof "${pack_real_sizeof} ${PROG_OUTPUT2},")
 endforeach ()
 
 if (pack_real_sizeof STREQUAL "")
@@ -293,27 +272,21 @@ set (PROG_SRC3
   "
        PROGRAM main
           USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
           IMPLICIT NONE
           INTEGER a
           REAL b
           DOUBLE PRECISION c
-          OPEN(8,FILE='pac_sizeof_native_kinds.out',FORM='formatted')
-          WRITE(8,*) ${FC_SIZEOF_A}
-          WRITE(8,*) kind(a)
-          WRITE(8,*) ${FC_SIZEOF_B}
-          WRITE(8,*) kind(b)
-          WRITE(8,*) ${FC_SIZEOF_C}
-          WRITE(8,*) kind(c)
-          CLOSE(8)
+          WRITE(stderr,*) ${FC_SIZEOF_A}
+          WRITE(stderr,*) kind(a)
+          WRITE(stderr,*) ${FC_SIZEOF_B}
+          WRITE(stderr,*) kind(b)
+          WRITE(stderr,*) ${FC_SIZEOF_C}
+          WRITE(stderr,*) kind(c)
        END
   "
 )
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  check_fortran_source_runs (${PROG_SRC3} PAC_SIZEOF_NATIVE_KINDS_RESULT SRC_EXT f90)
-else ()
-  FORTRAN_RUN ("SIZEOF NATIVE KINDs" ${PROG_SRC3} XX YY PAC_SIZEOF_NATIVE_KINDS_RESULT)
-endif ()
-file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_sizeof_native_kinds.out" PROG_OUTPUT3)
+FORTRAN_RUN ("SIZEOF NATIVE KINDs" ${PROG_SRC3} XX YY PAC_SIZEOF_NATIVE_KINDS_RESULT PROG_OUTPUT3)
 # dnl The output from the above program will be:
 # dnl    -- LINE 1 --  sizeof INTEGER
 # dnl    -- LINE 2 --  kind of INTEGER
@@ -321,9 +294,9 @@ file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_sizeof_native_kinds.out" PROG_OUTPUT3
 # dnl    -- LINE 4 --  kind of REAL
 # dnl    -- LINE 5 --  sizeof DOUBLE PRECISION
 # dnl    -- LINE 6 --  kind of DOUBLE PRECISION
-
+#
 # Convert the string to a list of strings by replacing the carriage return with a semicolon
-string (REGEX REPLACE "\n" ";" PROG_OUTPUT3 "${PROG_OUTPUT3}")
+string (REGEX REPLACE "[\r\n]+" ";" PROG_OUTPUT3 "${PROG_OUTPUT3}")
 
 list (GET PROG_OUTPUT3 0 PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
 list (GET PROG_OUTPUT3 1 PAC_FORTRAN_NATIVE_INTEGER_KIND)
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
index 5b7262e..795399e 100644
--- a/config/cmake/HDF5_Examples.cmake.in
+++ b/config/cmake/HDF5_Examples.cmake.in
@@ -81,19 +81,20 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN
 #endif()
 
 ###############################################################################################################
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ROOT:PATH=${INSTALLDIR}")
 if(WIN32)
   set(SITE_OS_NAME "Windows")
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
   set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
 else()
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
   set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
   set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif()
+### default HDF5_PLUGIN_PATH to where the filter libraries are located
+set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
 if(${CDASH_LOCAL})
   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
 endif()
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 7bfd0bd..e20ed6b 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -181,9 +181,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
     if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-developer-4.8")
     else ()
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-cxx-developer-4.8")
     endif ()
   endif ()
 
@@ -240,7 +240,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 
   # Append more extra warning flags that only gcc 9.3+ knows about
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
-    # do not use C warnings, gnu-warnings 9.3, no cxx warniings
+    # do not use C warnings, gnu-warnings 9.3, no cxx warnings
     # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
   endif ()
 
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 94c40aa..84b3ebe 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -62,7 +62,7 @@ if (NOT MSVC AND NOT MINGW)
   # General flags
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
     ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/ifort-general")
-    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand:f03" "-free")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand f03" "-free")
   elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
     ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
     list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ffree-form" "-fimplicit-none")
@@ -79,7 +79,6 @@ if (NOT MSVC AND NOT MINGW)
   endif ()
 
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-
     # Append more extra warning flags that only gcc 4.8+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.8)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
@@ -91,10 +90,11 @@ if (NOT MSVC AND NOT MINGW)
     #endif ()
 
     # Append more extra warning flags that only gcc 5.x+ knows about
-    # do not include -Wuse-without-only
-    #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
-    #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
-    #endif ()
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
+      if (HDF5_ENABLE_DEV_WARNINGS)
+        ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-gfort-5")
+      endif ()
+    endif ()
 
     # Append more extra warning flags that only gcc 6.x+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
@@ -118,8 +118,8 @@ if (NOT MSVC AND NOT MINGW)
   endif ()
 else ()
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
-    #ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-ifort-general")
-    list (APPEND HDF5_CMAKE_Fortran_FLAGS "/warn:all" "/stand:f03" "/free")
+    ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-ifort-general")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "/stand:f03" "/free")
   endif ()
 endif ()
 
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.md.cmake.in
index 9289870..b60e729 100644
--- a/config/cmake/README.txt.cmake.in
+++ b/config/cmake/README.md.cmake.in
@@ -14,7 +14,7 @@ It was built with the following options:
 The contents of this directory are:
 
     COPYING                 - Copyright notice
-    README.txt              - This file
+    README.md               - This file
     @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@    - HDF5 Install Package
 
 This binary was built with the ZLIB and SZIP/Libaec external libraries and are
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index e423deb..221c0c9 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -47,12 +47,12 @@ set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++"
 set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
 set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 
-set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use HDF5_ZLib from compressed file" FORCE)
 set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
 set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE)
 set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
 
-set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
+set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of HDF5_ZLIB package" FORCE)
 set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
 set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
 
@@ -85,12 +85,12 @@ set (BLOSC_TGZ_NAME "c-blosc.tar.gz" CACHE STRING "Use BLOSC from compressed fil
 
 set (BLOSC_PACKAGE_NAME "blosc" CACHE STRING "Name of BLOSC package" FORCE)
 
-set (ZLIB_GIT_URL "https://git@bitbucket.hdfgroup.org/scm/test/zlib.git" CACHE STRING "Use ZLIB from HDF repo" FORCE)
-set (ZLIB_GIT_BRANCH "master" CACHE STRING "" FORCE)
+set (BLOSC_ZLIB_GIT_URL "https://git@bitbucket.hdfgroup.org/scm/test/zlib.git" CACHE STRING "Use BLOSC_ZLIB from HDF repo" FORCE)
+set (BLOSC_ZLIB_GIT_BRANCH "master" CACHE STRING "" FORCE)
 
-set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+set (BLOSC_ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use BLOSC_ZLib from compressed file" FORCE)
 
-set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
+set (BLOSC_ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of BLOSC_ZLIB package" FORCE)
 
 #######
 # bzip2
@@ -159,15 +159,15 @@ set (LZF_PACKAGE_NAME "lzf" CACHE STRING "Name of LZF package" FORCE)
 #set (MAFISC_PACKAGE_NAME "mafisc" CACHE STRING "Name of MAFISC package" FORCE)
 
 ######
-# szf
+# sz
 ######
 
-set (SZF_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE)
-set (SZF_GIT_BRANCH "master" CACHE STRING "" FORCE)
+set (SZ_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ filter from github repository" FORCE)
+set (SZ_GIT_BRANCH "master" CACHE STRING "" FORCE)
 
-set (SZF_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE)
+set (SZ_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ filter from compressed file" FORCE)
 
-set (SZF_PACKAGE_NAME "szf" CACHE STRING "Name of SZ package" FORCE)
+set (SZ_PACKAGE_NAME "SZ" CACHE STRING "Name of SZ filter package" FORCE)
 
 ######
 # zfp
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index eab09ba..35cee4f 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -68,8 +68,8 @@ endif ()
 if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
   set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
       @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
-      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.25.jar
-      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.25.jar
+      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.33.jar
+      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.33.jar
   )
   set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARY "@PACKAGE_CURRENT_BUILD_DIR@/lib")
   set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARIES "${${HDF5_PACKAGE_NAME}_JAVA_LIBRARY}")
@@ -116,7 +116,7 @@ if (NOT TARGET "@HDF5_PACKAGE@")
     include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
   endif ()
   if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
-    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZ_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
   endif ()
   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
 endif ()
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 2ca1b75..13e50dd 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -47,7 +47,12 @@ else ()
   set (LOG_LEVEL "${TEST_LOG_LEVEL}")
 endif ()
 
-message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
+if (NOT TEST_VOL)
+  message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
+else ()
+  message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
+  set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
+endif ()
 
 if (WIN32)
   set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
diff --git a/config/cmake/jvolTest.cmake b/config/cmake/jvolTest.cmake
deleted file mode 100644
index b12c358..0000000
--- a/config/cmake/jvolTest.cmake
+++ /dev/null
@@ -1,301 +0,0 @@
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-# jrunTest.cmake executes a command and captures the output in a file. File is then compared
-# against a reference file. Exit status of command can also be compared.
-cmake_policy(SET CMP0007 NEW)
-
-# arguments checking
-if (NOT TEST_TESTER)
-  message (FATAL_ERROR "Require TEST_TESTER to be defined")
-endif ()
-if (NOT TEST_PROGRAM)
-  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-endif ()
-if (NOT TEST_LIBRARY_DIRECTORY)
-  message (STATUS "Require TEST_LIBRARY_DIRECTORY to be defined")
-endif ()
-if (NOT TEST_FOLDER)
-  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
-endif ()
-if (NOT TEST_OUTPUT)
-  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
-endif ()
-if (NOT TEST_CLASSPATH)
-  message (STATUS "Require TEST_CLASSPATH to be defined")
-endif ()
-if (NOT TEST_VOL)
-  message (FATAL_ERROR "Require TEST_VOL to be defined")
-endif ()
-
-if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
-  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
-endif ()
-
-if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
-  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
-endif ()
-
-if (NOT TEST_LOG_LEVEL)
-  set (LOG_LEVEL "info")
-else ()
-  set (LOG_LEVEL "${TEST_LOG_LEVEL}")
-endif ()
-
-message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
-
-set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
-
-if (WIN32)
-  set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
-else ()
-  set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
-endif ()
-
-# run the test program, capture the stdout/stderr and the result var
-execute_process (
-    COMMAND ${TEST_TESTER} -Xmx1024M
-    -Dorg.slf4j.simpleLogger.defaultLogLevel=${LOG_LEVEL}
-    -Djava.library.path=${TEST_LIBRARY_DIRECTORY}
-    -cp "${TEST_CLASSPATH}" ${TEST_ARGS} ${TEST_PROGRAM}
-    ${ARGN}
-    WORKING_DIRECTORY ${TEST_FOLDER}
-    RESULT_VARIABLE TEST_RESULT
-    OUTPUT_FILE ${TEST_OUTPUT}
-    ERROR_FILE ${TEST_OUTPUT}.err
-    OUTPUT_VARIABLE TEST_OUT
-    ERROR_VARIABLE TEST_ERROR
-)
-
-message (STATUS "COMMAND Result: ${TEST_RESULT}")
-
-# if the .err file exists and ERRROR_APPEND is enabled
-if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  list(LENGTH TEST_STREAM test_len)
-  if (test_len GREATER 0)
-    if (TEST_MASK_FILE)
-      STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
-    endif ()
-
-    if (NOT ERROR_APPEND)
-      # write back to original .err file
-      file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-    else ()
-      # append error output to the stdout output file
-      file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-    endif ()
-  endif ()
-endif ()
-
-# if the output file or the .err file needs to mask out error stack info
-if (TEST_MASK_ERROR)
-  if (NOT TEST_ERRREF)
-    # the error stack has been appended to the output file
-    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  else ()
-    # the error stack remains in the .err file
-    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  endif ()
-  string (REGEX REPLACE "Time:[^\n]+\n" "Time:  XXXX\n" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}")
-  #string (REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "HDF5 .[1-9]*[.][0-9]*[.][0-9]*[^)]*" "HDF5 (version (number)" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
-  # write back the changes to the original files
-  if (NOT TEST_ERRREF)
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-  else ()
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-  endif ()
-endif ()
-
-# if the return value is !=expected bail out
-if (NOT TEST_RESULT EQUAL TEST_EXPECT)
-  message (STATUS "ERROR OUTPUT: ${TEST_STREAM}")
-  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != 0.\n${TEST_ERROR}")
-endif ()
-
-message (STATUS "COMMAND Error: ${TEST_ERROR}")
-
-# compare output files to references unless this must be skipped
-set (TEST_COMPARE_RESULT 0)
-if (NOT TEST_SKIP_COMPARE)
-  if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
-    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-    list(LENGTH TEST_STREAM test_len)
-    if (test_len GREATER 0)
-      if (WIN32)
-        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
-          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
-        endif ()
-        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-      endif ()
-
-      if (NOT TEST_SORT_COMPARE)
-        # now compare the output with the reference
-        execute_process (
-            COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-            RESULT_VARIABLE TEST_COMPARE_RESULT
-        )
-      else ()
-        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
-        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
-        list (SORT v1)
-        list (SORT v2)
-        if (NOT v1 STREQUAL v2)
-          set(TEST_COMPARE_RESULT 1)
-        endif ()
-      endif ()
-
-      if (TEST_COMPARE_RESULT)
-        set (TEST_COMPARE_RESULT 0)
-        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
-        list (LENGTH test_act len_act)
-        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
-        list (LENGTH test_ref len_ref)
-        if (len_act GREATER 0 AND len_ref GREATER 0)
-          math (EXPR _FP_LEN "${len_ref} - 1")
-          foreach (line RANGE 0 ${_FP_LEN})
-            list (GET test_act ${line} str_act)
-            list (GET test_ref ${line} str_ref)
-            if (NOT str_act STREQUAL str_ref)
-              if (str_act)
-                set (TEST_COMPARE_RESULT 1)
-                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-              endif ()
-            endif ()
-          endforeach ()
-        else ()
-          if (len_act EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
-          endif ()
-          if (len_ref EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
-          endif ()
-        endif ()
-        if (NOT len_act EQUAL len_ref)
-          set (TEST_COMPARE_RESULT 1)
-        endif ()
-      endif ()
-    endif ()
-
-    message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
-
-    # again, if return value is !=0 scream and shout
-    if (TEST_COMPARE_RESULT)
-      message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
-    endif ()
-  endif ()
-
-  # now compare the .err file with the error reference, if supplied
-  set (TEST_ERRREF_RESULT 0)
-  if (TEST_ERRREF)
-    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-    list(LENGTH TEST_STREAM test_len)
-    if (test_len GREATER 0)
-      if (WIN32)
-        configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-        if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
-          file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
-        endif ()
-        #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-        #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-      endif ()
-
-      # now compare the error output with the error reference
-      execute_process (
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
-          RESULT_VARIABLE TEST_ERRREF_RESULT
-      )
-      if (TEST_ERRREF_RESULT)
-        set (TEST_ERRREF_RESULT 0)
-        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
-        list (LENGTH test_act len_act)
-        file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
-        list (LENGTH test_ref len_ref)
-        math (EXPR _FP_LEN "${len_ref} - 1")
-        if (len_act GREATER 0 AND len_ref GREATER 0)
-          math (EXPR _FP_LEN "${len_ref} - 1")
-          foreach (line RANGE 0 ${_FP_LEN})
-            list (GET test_act ${line} str_act)
-            list (GET test_ref ${line} str_ref)
-            if (NOT str_act STREQUAL str_ref)
-              if (str_act)
-                set (TEST_ERRREF_RESULT 1)
-                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-              endif ()
-            endif ()
-          endforeach ()
-        else ()
-          if (len_act EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
-          endif ()
-          if (len_ref EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
-          endif ()
-        endif ()
-        if (NOT len_act EQUAL len_ref)
-          set (TEST_ERRREF_RESULT 1)
-        endif ()
-      endif ()
-    endif ()
-
-    message (STATUS "COMPARE Result: ${TEST_ERRREF_RESULT}")
-
-    # again, if return value is !=0 scream and shout
-    if (TEST_ERRREF_RESULT)
-      message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
-    endif ()
-  endif ()
-endif ()
-
-set (TEST_GREP_RESULT 0)
-if (TEST_GREP_COMPARE)
-  # now grep the output with the reference
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  list(LENGTH TEST_STREAM test_len)
-  if (test_len GREATER 0)
-    # TEST_REFERENCE should always be matched
-    string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
-    string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
-    if (NOT TEST_GREP_RESULT)
-      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
-    endif ()
-
-    string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
-    if (TEST_EXPECT)
-      # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
-      string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
-      if (TEST_GREP_RESULT)
-        message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
-      endif ()
-    endif ()
-  endif ()
-endif ()
-
-# dump the output unless nodisplay option is set
-if (TEST_SKIP_COMPARE AND NOT TEST_NO_DISPLAY)
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  execute_process (
-      COMMAND ${CMAKE_COMMAND} -E echo ${TEST_STREAM}
-      RESULT_VARIABLE TEST_RESULT
-  )
-endif ()
-
-# everything went fine...
-message (STATUS "${TEST_PROGRAM} program used vol ${TEST_VOL} Passed")
-
diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
index ecdd13e..f5d8d4c 100644
--- a/config/cmake/libh5cc.in
+++ b/config/cmake/libh5cc.in
@@ -27,6 +27,27 @@ prg=$dir/$(basename -- "$prg") || exit
 printf '%s\n' "$prg"
 printf 'dir is %s\n' "$dir"
 
+
+# Show the configuration summary of the library recorded in the
+# libhdf5.settings file reside in the lib directory.
+showconfigure()
+{
+  cat $dir/lib/libhdf5.settings
+  status=$?
+}
+
 export PKG_CONFIG_PATH=$dir/lib/pkgconfig
 
-@_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
+for arg in $@ ; do
+  case "$arg" in
+    -showconfig)
+      showconfigure
+      exit $status
+      ;;
+    *)
+      @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
+      status=$?
+      exit $status
+      ;;
+  esac
+done
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index eb83c3a..d80b0f8 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -64,28 +64,29 @@ Languages:
 
 Features:
 ---------
-                   Parallel HDF5: @HDF5_ENABLE_PARALLEL@
-Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
-              Large Parallel I/O: @LARGE_PARALLEL_IO@
-              High-level library: @HDF5_BUILD_HL_LIB@
-                Build HDF5 Tests: @BUILD_TESTING@
-                Build HDF5 Tools: @HDF5_BUILD_TOOLS@
-     Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
-                    Threadsafety: @HDF5_ENABLE_THREADSAFE@
-             Default API mapping: @DEFAULT_API_VERSION@
-  With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
-          I/O filters (external): @EXTERNAL_FILTERS@
-                             MPE: @H5_HAVE_LIBLMPE@
-                      Direct VFD: @H5_HAVE_DIRECT@
-                      Mirror VFD: @H5_HAVE_MIRROR_VFD@
-              (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
-            (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
-                         dmalloc: @H5_HAVE_LIBDMALLOC@
-  Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
-                     API Tracing: @HDF5_ENABLE_TRACE@
-            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
- Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
-          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-                Use file locking: @HDF5_FILE_LOCKING_SETTING@
-       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
-    Optimization Instrumentation: @HDF5_Enable_Instrument@
+                     Parallel HDF5: @HDF5_ENABLE_PARALLEL@
+  Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
+                Large Parallel I/O: @LARGE_PARALLEL_IO@
+                High-level library: @HDF5_BUILD_HL_LIB@
+Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
+                  Build HDF5 Tests: @BUILD_TESTING@
+                  Build HDF5 Tools: @HDF5_BUILD_TOOLS@
+       Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
+                      Threadsafety: @HDF5_ENABLE_THREADSAFE@
+               Default API mapping: @DEFAULT_API_VERSION@
+    With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
+            I/O filters (external): @EXTERNAL_FILTERS@
+                               MPE: @H5_HAVE_LIBLMPE@
+                        Direct VFD: @H5_HAVE_DIRECT@
+                        Mirror VFD: @H5_HAVE_MIRROR_VFD@
+                (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
+              (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
+                           dmalloc: @H5_HAVE_LIBDMALLOC@
+    Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
+                       API Tracing: @HDF5_ENABLE_TRACE@
+              Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
+   Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
+            Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
+                  Use file locking: @HDF5_FILE_LOCKING_SETTING@
+         Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
+      Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index ee898b0..9a3ead2 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -37,8 +37,8 @@ cmake_minimum_required (VERSION 3.12)
 #     CTEST_SOURCE_NAME  -  source folder
 ##############################################################################
 
-set (CTEST_SOURCE_VERSION "1.13.0")
-set (CTEST_SOURCE_VERSEXT "-7")
+set (CTEST_SOURCE_VERSION "1.13.2")
+set (CTEST_SOURCE_VERSEXT "-1")
 
 ##############################################################################
 # handle input parameters to script.
@@ -68,7 +68,7 @@ endif ()
 
 # build generator must be defined
 if (NOT DEFINED BUILD_GENERATOR)
-  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, or VS201764, VS2015, VS201564")
+  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564")
 endif ()
 
 ###################################################################