SZ plugin changes from develop #1456 (#1527)

19 files changed, 57 insertions, 55 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 51ac61c..725390b 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -19,7 +19,7 @@ include (FetchContent)
 set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
 set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-  option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 1)
+  option (ZLIB_USE_EXTERNAL "Use External Library Building for HDF5_ZLIB" 1)
   option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1)
   if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
     set (ZLIB_URL ${ZLIB_GIT_URL} CACHE STRING "Path to zlib git repository")
@@ -82,7 +82,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
         set (H5_HAVE_ZLIB_H 1)
         set (H5_HAVE_LIBZ 1)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Filter ZLIB is built")
+          message (VERBOSE "Filter HDF5_ZLIB is built")
         endif ()
       else ()
         message (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
@@ -100,7 +100,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
   if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-    message (VERBOSE "Filter ZLIB is ON")
+    message (VERBOSE "Filter HDF5_ZLIB is ON")
   endif ()
 endif ()
 
@@ -149,9 +149,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
           message (VERBOSE "... with library AEC")
         endif ()
-        set (SZ_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
+        set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
       else ()
-        set (SZ_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
+        set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
       endif ()
     else ()
       message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43c6efc..cbb8163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -734,10 +734,10 @@ add_subdirectory (src)
 if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
     if (NOT ONLY_SHARED_LIBS)
-      add_dependencies (${HDF5_LIB_TARGET} ZLIB)
+      add_dependencies (${HDF5_LIB_TARGET} HDF5_ZLIB)
     endif ()
     if (BUILD_SHARED_LIBS)
-      add_dependencies (${HDF5_LIBSH_TARGET} ZLIB)
+      add_dependencies (${HDF5_LIBSH_TARGET} HDF5_ZLIB)
     endif ()
   endif ()
   if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index cf3a591..5beadce 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -24,6 +24,8 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
     "note.*expected.*void.*but argument is of type.*volatile"
     "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type"
     "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
+    "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 729fff8..d2a4747 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -44,7 +44,7 @@ MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
 
 # ----------------------------------------------------------------------
 # 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.
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 82d9f5f..4445113 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -668,7 +668,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/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 c22f557..39b4af1 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -134,8 +134,8 @@ FORTRAN_RUN ("REAL and INTEGER KINDs"
     PROG_OUTPUT
 )
 # 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
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 9456bb8..cfebee4 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -104,7 +104,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/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index eb0e61b..09d877b 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -67,7 +67,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
 
 ####      package examples       ####
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.8.14-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.8.15-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
 
 #############################################################################################
 ### enable parallel builds
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index e89d91e..e44eb93 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -155,7 +155,7 @@ CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h"    ${HDF_PREFIX}_HAVE_NETINET_IN_H)
 # _Bool type support
 CHECK_INCLUDE_FILE_CONCAT (stdbool.h    ${HDF_PREFIX}_HAVE_STDBOOL_H)
 
-## Check for non-standard extenstion quadmath.h
+## Check for non-standard extension quadmath.h
 
 CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
 if (${C_HAVE_QUADMATH})
@@ -610,7 +610,7 @@ if (WINDOWS)
         message (VERBOSE "Performing Test InitOnceExecuteOnce - Success")
       endif ()
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C SOURCE FILE Test InitOnceExecuteOnce succeded with the following output:\n"
+        "Performing C SOURCE FILE Test InitOnceExecuteOnce succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${HAVE_IOEO}\n")
     else ()
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index 1ac4134..d42b213 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -126,11 +126,11 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
   endif ()
   externalproject_get_property (SZIP BINARY_DIR SOURCE_DIR)
 
-##include (${BINARY_DIR}/${SZ_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target szip-static
   if (USE_LIBAEC)
     add_library(${HDF_PACKAGE_NAMESPACE}sz-static STATIC IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}sz-static "sz" STATIC "")
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}sz-static "szaec" STATIC "")
     add_dependencies (${HDF_PACKAGE_NAMESPACE}sz-static SZIP)
     add_library(${HDF_PACKAGE_NAMESPACE}aec-static STATIC IMPORTED)
     HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}aec-static "aec" STATIC "")
@@ -175,7 +175,7 @@ endmacro ()
 #-------------------------------------------------------------------------------
 macro (EXTERNAL_ZLIB_LIBRARY compress_type)
   if (${compress_type} MATCHES "GIT")
-    EXTERNALPROJECT_ADD (ZLIB
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
         GIT_REPOSITORY ${ZLIB_URL}
         GIT_TAG ${ZLIB_BRANCH}
         INSTALL_COMMAND ""
@@ -194,7 +194,7 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
             -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
     )
   elseif (${compress_type} MATCHES "TGZ")
-    EXTERNALPROJECT_ADD (ZLIB
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
         URL ${ZLIB_URL}
         URL_MD5 ""
         INSTALL_COMMAND ""
@@ -213,19 +213,15 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
             -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
     )
   endif ()
-  externalproject_get_property (ZLIB BINARY_DIR SOURCE_DIR)
+  externalproject_get_property (HDF5_ZLIB BINARY_DIR SOURCE_DIR)
 
-  if (WIN32)
-    set (ZLIB_LIB_NAME "zlib")
-  else ()
-    set (ZLIB_LIB_NAME "z")
-  endif ()
+  set (ZLIB_LIB_NAME "z")
 ##include (${BINARY_DIR}/${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target zlib-static
   add_library(${HDF_PACKAGE_NAMESPACE}zlib-static STATIC IMPORTED)
 #  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
   HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-static ${ZLIB_LIB_NAME} STATIC "")
-  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static ZLIB)
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static HDF5_ZLIB)
   set (ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
   set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
 
@@ -243,6 +239,6 @@ macro (PACKAGE_ZLIB_LIBRARY compress_type)
   )
   set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
   if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
-    add_dependencies (ZLIB-GenHeader-Copy ZLIB)
+    add_dependencies (ZLIB-GenHeader-Copy HDF5_ZLIB)
   endif ()
 endmacro ()
diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake
index 9cbcd76..c96298f 100644
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@@ -22,7 +22,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
 endif ()
 
 #-------------------------------------------------------------------------------
-#  Fix Fortran flags if we are compiling staticly on Windows using
+#  Fix Fortran flags if we are compiling statically on Windows using
 #  Windows_MT.cmake from config/cmake/UserMacros
 #-------------------------------------------------------------------------------
 if (BUILD_STATIC_CRT_LIBS)
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index f552dcd..05f4473 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -243,7 +243,14 @@ if (NOT TEST_SKIP_COMPARE)
         list (LENGTH test_act len_act)
         file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
         list (LENGTH test_ref len_ref)
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
         if (len_act GREATER 0 AND len_ref GREATER 0)
+          if (TEST_SORT_COMPARE)
+            list (SORT test_act)
+            list (SORT test_ref)
+          endif ()
           math (EXPR _FP_LEN "${len_ref} - 1")
           foreach (line RANGE 0 ${_FP_LEN})
             list (GET test_act ${line} str_act)
@@ -263,9 +270,6 @@ if (NOT TEST_SKIP_COMPARE)
             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 ()
 
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 7575ada..635ff5d 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -58,7 +58,7 @@ load_gnu_arguments()
 if test "X-" = "X-$cxx_flags_set"; then
     # PathScale compiler spits out gcc version string too. Need to
     # filter it out.
-    # icc beginning with version 12 includes a "gcc version compatiblilty"
+    # icc beginning with version 12 includes a "gcc version compatibility"
     # string, causing the gcc H5_CXXFLAGS to be erroneously added.  The line
     # "grep -v 'icc version'" causes the discarding of any output
     # containing 'icc version'.  The cxx_version for icc is correctly determined
diff --git a/config/gnu-flags b/config/gnu-flags
index 89239df..fe6626d 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -58,7 +58,7 @@ load_gnu_arguments()
 if test "X-" = "X-$cc_flags_set"; then
     # PathScale compiler spits out gcc version string too. Need to
     # filter it out.
-    # icc beginning with version 12 includes a "gcc version compatiblilty"
+    # icc beginning with version 12 includes a "gcc version compatibility"
     # string, causing the gcc H5_CFLAGS to be erroneously added.  The line
     # "grep -v 'icc version'" causes the discarding of any output
     # containing 'icc version'.  The cc_version for icc is correctly determined
diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index 72b5402..3180a3c 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -10,7 +10,7 @@ This tar file contains
     LIBAEC.tar.gz       source for building SZIP replacement
     ZLib.tar.gz         source for building ZLIB
     hdf5_plugins.tar.gz source for building compression plugins
-    HDF5Examples-1.8.14-Source.tar.gz  source for building examples
+    HDF5Examples-1.8.15-Source.tar.gz  source for building examples
 
 For more information about building HDF5 with CMake, see USING_HDF5_CMake.txt in
 hdf5-1.8.22/release_docs, or
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 4ad7053..6aa1a50 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -316,7 +316,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont
  *      This is a special case subfunction to print the data in a region reference of type blocks.
  *
  * Return:
- *      The function returns FAIL if there was an error, otherwise SUCEED
+ *      The function returns FAIL if there was an error, otherwise SUCCEED
  *
  * Parameters Description:
  *      h5tools_str_t *buffer is the string into which to render
@@ -338,7 +338,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
     hsize_t *         count           = NULL;
     hsize_t           blkndx;
     hsize_t           total_size[H5S_MAX_RANK];
-    hsize_t           elmtno; /* elemnt index  */
+    hsize_t           elmtno; /* element index  */
     hsize_t           curr_pos = 0;
     unsigned int      region_flags; /* buffer extent flags */
     hsize_t           numelem;
@@ -734,7 +734,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre
 {
     hbool_t           dimension_break = TRUE;
     hsize_t *         dims1           = NULL;
-    hsize_t           elmtno; /* elemnt index  */
+    hsize_t           elmtno; /* element index  */
     hsize_t           curr_pos = 0;
     hsize_t           total_size[H5S_MAX_RANK];
     hsize_t           jndx;
@@ -1124,7 +1124,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
 
     H5TOOLS_START_DEBUG(" ");
     if ((size_t)ctx->ndims > NELMTS(sm_size))
-        H5TOOLS_THROW(FAIL, "ndims and sm_size comparision failed");
+        H5TOOLS_THROW(FAIL, "ndims and sm_size comparison failed");
 
     size_row_block = ctx->sset->block.data[row_dim];
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 7f42ec4..f23d726 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -120,7 +120,7 @@ h5tools_str_append(h5tools_str_t *str /*in,out*/, const char *fmt, ...)
 
         /* Note: HDvsnprintf() behaves differently on Windows as Unix, when
          * buffer is smaller than source string. On Unix, this function
-         * returns length of the source string and copy string upto the
+         * returns length of the source string and copy string up to the
          * buffer size with NULL at the end of the buffer. However on
          * Windows with the same condition, this function returns -1 and
          * doesn't add NULL at the end of the buffer.
@@ -138,7 +138,7 @@ h5tools_str_append(h5tools_str_t *str /*in,out*/, const char *fmt, ...)
              * following conditions, each of which indicates that the proper C99 return value probably
              *  should have been positive when the format string is
              *  something other than "%s"
-             * Alocate at least twice as much space and try again.
+             * Allocate at least twice as much space and try again.
              */
             size_t newsize = MAX(str->len + (size_t)nchars + 1, 2 * str->nalloc);
             HDassert(newsize > str->nalloc); /*overflow*/
@@ -1041,7 +1041,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
                 /* Print the closing bracket */
                 h5tools_str_append(str, "%s", OPT(info->arr_suf, "]"));
-                is_next_arry_elmt = 1; /* set for begining of next array element */
+                is_next_arry_elmt = 1; /* set for beginning of next array element */
                 H5Tclose(memb);
             } break;
 
@@ -1283,7 +1283,7 @@ h5tools_str_is_zero(const void *_mem, size_t size)
  *              March 8, 2012
  *
  * Notes:
- *   Applications need to call free() to free the memoery allocated for
+ *   Applications need to call free() to free the memory allocated for
  *   the return string
  *
  *-------------------------------------------------------------------------