Merge branch 'develop' into zzz-gitlab-ci

25 files changed, 351 insertions, 99 deletions

diff --git a/config/clang-cxxflags b/config/clang-cxxflags
index edd62e7..4926313 100644
--- a/config/clang-cxxflags
+++ b/config/clang-cxxflags
@@ -173,6 +173,7 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
 
     H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
     H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
+    H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_clang_arguments noerror-general)"
 
     ######################
     # Developer warnings #
diff --git a/config/clang-flags b/config/clang-flags
index b4f5e2e..cb5ce8d 100644
--- a/config/clang-flags
+++ b/config/clang-flags
@@ -173,6 +173,7 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
 
     H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
     H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
+    H5_NECFLAGS="$H5_NECFLAGS $(load_clang_arguments noerror-general)"
 
     ######################
     # Developer warnings #
diff --git a/config/clang-warnings/noerror-general b/config/clang-warnings/noerror-general
new file mode 100644
index 0000000..ad50dfc
--- /dev/null
+++ b/config/clang-warnings/noerror-general
@@ -0,0 +1,80 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+-Wbad-function-cast
+-Wimplicit-function-declaration
+-Wincompatible-pointer-types
+-Wmissing-declarations
+-Wpacked
+-Wshadow
+-Wswitch
+#
+# NOTE: Following files are not compatible with incompatible-pointer-types as errors
+#     src/H5Dchunk.c,src/H5Dint.c,src/H5Gint.c,src/H5HFcache.c,src/H5I.c,src/H5T.c
+-Wno-error=incompatible-pointer-types-discards-qualifiers
+#
+#
+# NOTE: File Driver files are not compatible with these warnings as errors
+#     H5FDdirect.c,H5FDmpio.c,H5FDros3.c,
+#       -Werror=unused-function
+#
+-Wunused-function
+#
+#     H5FDdrvr_module.h
+#       -Werror=unused-variable
+#
+-Wunused-variable
+#
+#     H5VLpassthru.c
+#       -Werror=unused-parameter
+#
+-Wunused-parameter
+#
+#
+#
+# NOTE: Tools files are not compatible with these warnings as errors
+#     lib/h5tools.c
+#       -Werror=cast-align
+#
+-Wcast-align
+#
+#     lib/h5tools_utils.c
+#       -Werror=unused-parameter
+#
+#
+# NOTE: JNI files are not compatible with these warnings as errors
+#     jni/h5pDCPLImp.c,jni/nativeData.c,jni/h5util.c,jni/h5rImp.c
+#     jni/h5sImp.c,jni/h5tImp.c
+#       -Werror=cast-align
+#     jni/h5util.c
+#       -Werror=format(-overflow)
+#
+-Wformat
+#
+#
+#Examples and tests do not use the same set of extensive warning flags as libraries
+# Here is a list of tests and examples that have issues with the stricter warnings as error
+#
+# NOTE: Test files are not compatible with these warnings as errors
+#     thread_id.c,
+#       -Werror=unused-function
+#     dsets.c
+#       -Werror=unused-parameter
+#
+#
+# NOTE: Examples files are not compatible with these warnings as errors
+#     h5_vds-eiger.c,h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,h5_vds-percival-unlim-maxmin.c
+#     h5_vds-percival.c,h5_read.c,h5_rdwt.c,h5_mount.c,h5_extend.c,h5_extend_write.c
+#     h5_write.c,h5_vds-simpleIO.c,h5_ref2reg_deprec.c,h5_crtgrp.c,h5_select.c
+#     h5_vds-percival-unlim.c,h5_crtatt.c,h5_group.c,h5_attribute.c,h5_crtdat.c
+#     h5_reference_deprec.c
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=strict-prototypes
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=old-style-definition
+#     h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,
+#       -Werror=unused-variable
+#     h5_elink_unix2win.c,h5_extlink.c,h5_attribute.c
+#       -Werror=unused-parameter
+
diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake
index 3cded02..46d3979 100644
--- a/config/cmake/HDF5PluginMacros.cmake
+++ b/config/cmake/HDF5PluginMacros.cmake
@@ -26,7 +26,7 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
             # the hdf5 settings
             -DHDF5_PACKAGE_NAME:STRING=hdf5
             -DHDF5_HDF5_HEADER:STRING=h5pubconf.h
-            -DHDF5_LINK_LIBS:STRING=$<TARGET_FILE:${HDF5_LIBSH_TARGET}>
+            -DHDF5_LINK_LIBS:STRING=$<TARGET_LINKER_FILE:${HDF5_LIBSH_TARGET}>
             -DHDF5_INCLUDE_DIR:PATH=${HDF5_SRC_DIR}|${HDF5_SRC_BINARY_DIR}
             -DPL_PACKAGE_NAME:STRING=${PLUGIN_PACKAGE_NAME}
             -DH5PL_CPACK_ENABLE:BOOL=ON
@@ -49,8 +49,8 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
             -DLZ4_PACKAGE_NAME:STRING=${LZ4_PACKAGE_NAME}
             -DLZF_TGZ_NAME:STRING=${LZF_TGZ_NAME}
             -DLZF_PACKAGE_NAME:STRING=${LZF_PACKAGE_NAME}
-            #-DSZ_TGZ_NAME:STRING=${SZ_TGZ_NAME}
-            #-DSZ_PACKAGE_NAME:STRING=${SZ_PACKAGE_NAME}
+            -DSZF_TGZ_NAME:STRING=${SZF_TGZ_NAME}
+            -DSZF_PACKAGE_NAME:STRING=${SZF_PACKAGE_NAME}
             -DZFP_TGZ_NAME:STRING=${ZFP_TGZ_NAME}
             -DZFP_PACKAGE_NAME:STRING=${ZFP_PACKAGE_NAME}
     )
@@ -78,7 +78,7 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
             # the hdf5 settings
             -DHDF5_PACKAGE_NAME:STRING=hdf5
             -DHDF5_HDF5_HEADER:STRING=h5pubconf.h
-            -DHDF5_LINK_LIBS:STRING=$<TARGET_FILE:${HDF5_LIBSH_TARGET}>
+            -DHDF5_LINK_LIBS:STRING=$<TARGET_LINKER_FILE:${HDF5_LIBSH_TARGET}>
             -DHDF5_INCLUDE_DIR:PATH=${HDF5_SRC_DIR}|${HDF5_SRC_BINARY_DIR}
             -DPL_PACKAGE_NAME:STRING=${PLUGIN_PACKAGE_NAME}
             -DH5PL_CPACK_ENABLE:BOOL=ON
@@ -101,8 +101,8 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
             -DLZ4_PACKAGE_NAME:STRING=${LZ4_PACKAGE_NAME}
             -DLZF_TGZ_NAME:STRING=${LZF_TGZ_NAME}
             -DLZF_PACKAGE_NAME:STRING=${LZF_PACKAGE_NAME}
-            #-DSZ_TGZ_NAME:STRING=${SZ_TGZ_NAME}
-            #-DSZ_PACKAGE_NAME:STRING=${SZ_PACKAGE_NAME}
+            -DSZF_TGZ_NAME:STRING=${SZF_TGZ_NAME}
+            -DSZF_PACKAGE_NAME:STRING=${SZF_PACKAGE_NAME}
             -DZFP_TGZ_NAME:STRING=${ZFP_TGZ_NAME}
             -DZFP_PACKAGE_NAME:STRING=${ZFP_PACKAGE_NAME}
     )
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 7bbebbc..5925989 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -89,7 +89,11 @@ if (NOT MSVC AND NOT MINGW)
           AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
         # add the general CXX flags for g++ compiler versions 4.8 and above.
         ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
-        ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
+        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+          ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
+        else ()
+          ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
+        endif ()
       endif ()
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
       ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
@@ -152,7 +156,11 @@ if (NOT MSVC AND NOT MINGW)
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
-      ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
+      else ()
+        ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
+      endif ()
     endif ()
 
     # Append more extra warning flags that only gcc 6.x+ know about
@@ -177,7 +185,11 @@ if (NOT MSVC AND NOT MINGW)
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      #ADD_H5_FLAGS (H5_CXXFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+      #if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      #  ADD_H5_FLAGS (H5_CXXFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+      #else ()
+      #  ADD_H5_FLAGS (H5_CXXFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
+      #endif ()
       if (HDF5_ENABLE_DEV_WARNINGS)
         # autotools always add the C flags with the CXX flags
         ADD_H5_FLAGS (H5_CXXFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 31af2f8..5f35e61 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -69,6 +69,18 @@ endif ()
 # break into groups (from the config/gnu-flags file)
 #-----------------------------------------------------------------------------
 if (NOT MSVC AND NOT MINGW)
+  #-----------------------------------------------------------------------------
+  # Option to allow the user to interpret certain warnings as errors
+  #
+  # This should NOT be on by default as it can cause a lot of conflicts with
+  # new operating systems and compiler versions. Header files that are out of
+  # our control (MPI, HDFS, etc.) can also raise warnings.
+  #-----------------------------------------------------------------------------
+  option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
+  if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+    message (STATUS "...some warnings will be interpreted as errors")
+  endif ()
+
   if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
     list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
   else ()
@@ -96,14 +108,22 @@ if (NOT MSVC AND NOT MINGW)
       # Add general CFlags for GCC versions 4.8 and above
       if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
         ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
-        ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
+        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+          ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
+        else ()
+          ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
+        endif ()
       endif ()
       # gcc automatically inlines based on the optimization level
       # this is just a failsafe
       list (APPEND H5_CFLAGS0 "-finline-functions")
     elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang")
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
-      ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+      else ()
+        ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
+      endif ()
     elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
       list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
     endif ()
@@ -132,7 +152,6 @@ if (NOT MSVC AND NOT MINGW)
     endif ()
   endif ()
 
-
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     # Technically, variable-length arrays are part of the C99 standard, but
     #   we should approach them a bit cautiously... Only needed for gcc 4.X
@@ -158,7 +177,11 @@ if (NOT MSVC AND NOT MINGW)
     # Append more extra warning flags that only gcc 5.x+ know about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
-      ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+      else ()
+        ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+      endif ()
     endif ()
 
     # Append more extra warning flags that only gcc 6.x+ know about
@@ -179,7 +202,9 @@ if (NOT MSVC AND NOT MINGW)
     # Append more extra warning flags that only gcc 8.x+ know about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
       ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+      endif ()
       if (HDF5_ENABLE_DEV_WARNINGS)
         ADD_H5_FLAGS (H5_CFLAGS3 "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
       else ()
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 926e230..71c8b4a 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -40,6 +40,8 @@ set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE)
 
 set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
 
+set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++" FORCE)
+
 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)
 
@@ -155,15 +157,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)
 
 ######
-# sz
+# szf
 ######
 
-set (SZ_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE)
-set (SZ_GIT_BRANCH "master" CACHE STRING "" FORCE)
+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_TGZ_NAME "sz.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE)
+set (SZF_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE)
 
-set (SZ_PACKAGE_NAME "sz" CACHE STRING "Name of SZ package" FORCE)
+set (SZF_PACKAGE_NAME "szf" CACHE STRING "Name of SZ package" FORCE)
 
 ######
 # zfp
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 41570eb..7d59ce5 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -49,7 +49,7 @@ 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 (WIN32 OR MINGW)
+if (WIN32)
   set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
 else ()
   set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -131,7 +131,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
@@ -202,7 +202,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
diff --git a/config/cmake/jvolTest.cmake b/config/cmake/jvolTest.cmake
index 3a3877b..bcd9dbd 100644
--- a/config/cmake/jvolTest.cmake
+++ b/config/cmake/jvolTest.cmake
@@ -54,7 +54,7 @@ message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.sl
 
 set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
 
-if (WIN32 OR MINGW)
+if (WIN32)
   set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
 else ()
   set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -136,7 +136,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
     list(LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
@@ -207,7 +207,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
     list(LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 3a8d5b7..61c535e 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -204,7 +204,7 @@ endif ()
 #set (LOCAL_NO_PACKAGE "TRUE")
 #####       Following controls source update                  #####
 #set (LOCAL_UPDATE "TRUE")
-set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
+set (REPOSITORY_URL "https://github.com/HDFGroup/hdf5.git")
 set (REPOSITORY_BRANCH "develop")
 
 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index f132234..33ec74b 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -57,7 +57,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT")
 ### ext libs on system
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=NO")
+#set(ENV{ZLIB_ROOT} "some_location")
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include")
+#set(ENV{SZIP_ROOT} "some_location")
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include")
 
 ### disable using ext zlib
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index eb0392e..8ca8159 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -143,8 +143,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
     endif ()
   endif ()
 
-  #----- Use MSVC Naming conventions for Shared Libraries
-  if (MINGW AND ${libtype} MATCHES "SHARED")
+  option (HDF5_MSVC_NAMING_CONVENTION "Use MSVC Naming conventions for Shared Libraries" OFF)
+  if (HDF5_MSVC_NAMING_CONVENTION AND MINGW AND ${libtype} MATCHES "SHARED")
     set_target_properties (${libtarget} PROPERTIES
         IMPORT_SUFFIX ".lib"
         IMPORT_PREFIX ""
@@ -343,7 +343,7 @@ macro (HDF_DIR_PATHS package_prefix)
     set (${package_prefix}_INSTALL_INCLUDE_DIR include)
   endif ()
   if (NOT ${package_prefix}_INSTALL_DATA_DIR)
-    if (NOT WIN32)
+    if (NOT MSVC)
       if (APPLE)
         if (${package_prefix}_BUILD_FRAMEWORKS)
           set (${package_prefix}_INSTALL_EXTRA_DIR ../SharedSupport)
@@ -353,12 +353,13 @@ macro (HDF_DIR_PATHS package_prefix)
         set (${package_prefix}_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
       endif ()
       set (${package_prefix}_INSTALL_DATA_DIR share)
-      set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake)
     else ()
       set (${package_prefix}_INSTALL_DATA_DIR ".")
-      set (${package_prefix}_INSTALL_CMAKE_DIR cmake)
     endif ()
   endif ()
+  if (NOT ${package_prefix}_INSTALL_CMAKE_DIR)
+    set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake)
+  endif ()
 
   # Always use full RPATH, i.e. don't skip the full RPATH for the build tree
   set (CMAKE_SKIP_BUILD_RPATH  FALSE)
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index b011ae8..758b62b 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -46,7 +46,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 OR MINGW)
+  if (WIN32)
     set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
   else ()
     set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -105,7 +105,7 @@ if (TEST_ERRREF)
       file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
       list (LENGTH TEST_STREAM test_len)
       if (test_len GREATER 0)
-        if (WIN32 OR MINGW)
+        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})
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 2b8b6b0..baf15c0 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -38,7 +38,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 OR MINGW)
+  if (WIN32)
     set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
   else ()
     set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -212,7 +212,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
@@ -283,7 +283,7 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32 OR MINGW)
+      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})
diff --git a/config/commence.am b/config/commence.am
index 6e3d9a9..f47d704 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -70,9 +70,9 @@ H5CPP=${DESTDIR}$(bindir)/h5c++
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
 
-AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@ @H5_ECFLAGS@
+AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@
 AM_FCFLAGS=@AM_FCFLAGS@ @H5_FCFLAGS@
-AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@ @H5_ECXXFLAGS@
+AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@
 AM_CPPFLAGS=@AM_CPPFLAGS@ @H5_CPPFLAGS@
 AM_LDFLAGS=@AM_LDFLAGS@ @H5_LDFLAGS@
 
@@ -96,9 +96,9 @@ CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2
 # commands that should be executed even if a file with the same name already
 # exists.
 .PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        check-passthrough-vol install-doc lib progs tests uninstall-doc \
-        _exec_check-s _test help
+	build-tests check-clean check-install check-p check-s check-vfd \
+	check-passthrough-vol install-doc lib progs tests uninstall-doc \
+	_exec_check-s _test help trace doxygen
 
 help:
 	@$(top_srcdir)/bin/makehelp
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 44cbc69..eb490b3 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -184,6 +184,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8 -o $cxx_vers_major -ge 5; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-general)"
         H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-general)"
+        H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments cxx-noerror-general)"
 
     ######################
     # Developer warnings #
@@ -224,6 +225,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -ge 5; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-5)"
         H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-5)"
+        H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments cxx-noerror-5)"
     fi
 
     # gcc >= 6
@@ -241,6 +243,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -ge 8; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 8)"
         #H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments error-8)"
+        #H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments noerror-8)"
         DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments developer-8)"
         NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-developer-8)"
     fi
diff --git a/config/gnu-flags b/config/gnu-flags
index 7cf90b8..f9b9ceb 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -118,12 +118,16 @@ if test "X-gcc" = "X-$cc_vendor"; then
     esac
 
     case "$host_os-$host_cpu" in
-        # cygwin needs the "-std=c99" flag removed, so make
-        # a specific case for Cygwin without the flag and a default
-        # case to add the flag everywhere else
+        # Cygwin needs the "-std=c99" flag removed.
         cygwin-*)
             ;;
-
+        # On Solaris, gcc needs the gnu99 standard to pick up certain POSIX
+        # things. Do NOT use this as the gcc norm as this encourages the use
+        # of non-standard gcc extensions.
+        *solaris*)
+            H5_CFLAGS="$H5_CFLAGS -std=gnu99"
+            ;;
+        # Everybody else gets c99 as the standard.
         *)
             H5_CFLAGS="$H5_CFLAGS -std=c99"
             ;;
@@ -192,6 +196,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8 -o $cc_vers_major -gt 4; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments general)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-general)"
+        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-general)"
 
     ######################
     # Developer warnings #
@@ -231,6 +236,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -ge 5; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 5)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-5)"
+        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-5)"
     fi
 
     # gcc >= 6
@@ -248,6 +254,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -ge 8; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 8)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-8)"
+        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-8)"
         DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-8)"
         NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments no-developer-8)"
     fi
diff --git a/config/gnu-warnings/7 b/config/gnu-warnings/7
index 266f5c1..9d5b44d 100644
--- a/config/gnu-warnings/7
+++ b/config/gnu-warnings/7
@@ -3,5 +3,4 @@
 -Wduplicated-branches
 -Wformat-overflow=2
 -Wformat-truncation=1
--Wimplicit-fallthrough=5
 -Wrestrict
diff --git a/config/gnu-warnings/cxx-noerror-5 b/config/gnu-warnings/cxx-noerror-5
new file mode 100644
index 0000000..7bce3e8
--- /dev/null
+++ b/config/gnu-warnings/cxx-noerror-5
@@ -0,0 +1,11 @@
+#
+# In GCC 4.4.7, the compiler gripes about shadowed global
+# declarations when a local variable uses the name of a
+# function that's in a system header file.  For some reason,
+# later versions of GCC (e.g., 5.2.0) don't complain about
+# the shadowed globals.  Maybe later versions are less fussy?
+# Anyway, the shadowing seems to be harmless, and GCC 4.4.7
+# is not a supported compiler, so let us promote shadowed globals
+# warnings to errors only for GCC 5 and later.
+#
+-Wshadow
diff --git a/config/gnu-warnings/cxx-noerror-general b/config/gnu-warnings/cxx-noerror-general
new file mode 100644
index 0000000..8cc1d94
--- /dev/null
+++ b/config/gnu-warnings/cxx-noerror-general
@@ -0,0 +1,32 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/tcompound.cpp
+#       -Werror=cast-align
+-Wcast-align
+# NOTE: c++/src files are not compatible with these warnings as errors
+#     c++/src/H5Object.cpp
+#       -Werror=missing-declarations
+-Wmissing-declarations
+-Wpacked
+-Wredundant-decls
+-Wswitch
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/tattr.cpp
+#       -Werror=unused-but-set-variable
+-Wunused-but-set-variable
+-Wunused-function
+-Wunused-variable
+# NOTE: c++/src files are not compatible with these warnings as errors
+#     c++/src/H5Object.cpp,c++/src/H5StrType.cpp,c++/src/H5PredType.cpp
+#       -Werror=unused-parameter
+-Wunused-parameter
+#
+# Other files not compatible
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/titerate.cpp,c++/test/tarray.cpp
+#       -Werror=missing-declarations
+#     c++/test/titerate.cpp,c++/test/tarray.cpp,c++/test/tlinks.cpp,c++/test/ttypes.cpp,c++/test/dsets.cpp
+#       -Werror=unused-parameter
diff --git a/config/gnu-warnings/noerror-5 b/config/gnu-warnings/noerror-5
new file mode 100644
index 0000000..a7d40dd
--- /dev/null
+++ b/config/gnu-warnings/noerror-5
@@ -0,0 +1,12 @@
+-Wincompatible-pointer-types
+#
+# In GCC 4.4.7, the compiler gripes about shadowed global
+# declarations when a local variable uses the name of a
+# function that's in a system header file.  For some reason,
+# later versions of GCC (e.g., 5.2.0) don't complain about
+# the shadowed globals.  Maybe later versions are less fussy?
+# Anyway, the shadowing seems to be harmless, and GCC 4.4.7
+# is not a supported compiler, so let us promote shadowed globals
+# warnings to errors only for GCC 5 and later.
+#
+-Wshadow
diff --git a/config/gnu-warnings/noerror-8 b/config/gnu-warnings/noerror-8
new file mode 100644
index 0000000..2f54a4d
--- /dev/null
+++ b/config/gnu-warnings/noerror-8
@@ -0,0 +1,25 @@
+# NOTE: src/ files are not compatible with these warnings as errors
+#     src/H5Dchunk.c
+#       -Werror=cast-function-type
+-Wcast-function-type
+#
+# For GCC 8, promote maybe-initialized warnings to an error.  GCC 8
+# reports 0 maybe-uninitialized warnings where earlier versions
+# make many false reports.  GCC 8 seems to analyze calls to static
+# in order to detect initializations that occur there.  It's possible
+# that GCC 8 only performs that analysis at -O3, though.
+#
+#
+# NOTE: File Driver files are not compatible with these warnings as errors
+#     H5FDlog.c,
+#       -Werror=maybe-uninitialized
+-Wmaybe-uninitialized
+# NOTE: src/ files are not compatible with these warnings as errors
+#     src/H5Shyper.c,src/H5SL.c,src/H5Shyper.c
+#       -Werror=maybe-uninitialized
+# NOTE: Test files are not compatible with these warnings as errors
+#     test/cache_common.c,
+#       -Werror=maybe-uninitialized
+# NOTE: hl/src/ files are not compatible with these warnings as errors
+#     hl/src/H5DS.c,
+#       -Werror=maybe-uninitialized
diff --git a/config/gnu-warnings/noerror-general b/config/gnu-warnings/noerror-general
new file mode 100644
index 0000000..e19014f
--- /dev/null
+++ b/config/gnu-warnings/noerror-general
@@ -0,0 +1,91 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+-Wbad-function-cast
+-Wdeclaration-after-statement
+-Wimplicit-function-declaration
+-Wmissing-declarations
+-Wmissing-prototypes
+-Wnested-externs
+-Wold-style-definition
+-Wpacked
+-Wpointer-sign
+-Wpointer-to-int-cast
+-Wredundant-decls
+-Wstrict-prototypes
+-Wswitch
+#
+#-Werror=discarded-qualifiers
+#
+#
+# NOTE: File Driver files are not compatible with these warnings as errors
+#     H5FDdirect.c,H5FDmpio.c,H5FDros3.c,
+#       -Werror=unused-function
+#
+-Wunused-function
+#
+#     H5FDdrvr_module.h
+#       -Werror=unused-variable
+#
+-Wunused-variable
+#
+#     H5VLpassthru.c
+#       -Werror=unused-parameter
+#
+-Wunused-parameter
+#
+#
+#
+# NOTE: Tools files are not compatible with these warnings as errors
+#     lib/h5tools.c
+#       -Werror=cast-align
+#
+-Wcast-align
+#
+#     lib/h5diff_array.c
+#       -Werror=unused-but-set-variable
+#
+-Wunused-but-set-variable
+#
+#     lib/h5tools_utils.c
+#       -Werror=unused-parameter
+#
+#
+# NOTE: JNI files are not compatible with these warnings as errors
+#     jni/h5pDCPLImp.c,jni/nativeData.c,jni/h5util.c,jni/h5rImp.c
+#     jni/h5sImp.c,jni/h5tImp.c
+#       -Werror=cast-align
+#     jni/h5util.c
+#       -Werror=format(-overflow)
+#
+-Wformat
+#
+#
+#Examples and tests do not use the same set of extensive warning flags as libraries
+# Here is a list of tests and examples that have issues with the stricter warnings as error
+#
+# NOTE: Test files are not compatible with these warnings as errors
+#     thread_id.c,
+#       -Werror=unused-function
+#     dsets.c
+#       -Werror=unused-parameter
+#     external.c,perform/sio_engine.c
+#       -Werror=format(-truncation)
+#
+#
+# NOTE: Examples files are not compatible with these warnings as errors
+#     h5_vds-eiger.c,h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,h5_vds-percival-unlim-maxmin.c
+#     h5_vds-percival.c,h5_read.c,h5_rdwt.c,h5_mount.c,h5_extend.c,h5_extend_write.c
+#     h5_write.c,h5_vds-simpleIO.c,h5_ref2reg_deprec.c,h5_crtgrp.c,h5_select.c
+#     h5_vds-percival-unlim.c,h5_crtatt.c,h5_group.c,h5_attribute.c,h5_crtdat.c
+#     h5_reference_deprec.c
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=strict-prototypes
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=old-style-definition
+#     h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,
+#       -Werror=unused-variable
+#     h5_elink_unix2win.c,h5_extlink.c,h5_attribute.c
+#       -Werror=unused-parameter
+
diff --git a/config/sanitizer/formatting.cmake b/config/sanitizer/formatting.cmake
index 677a69a..5aaa2a6 100644
--- a/config/sanitizer/formatting.cmake
+++ b/config/sanitizer/formatting.cmake
@@ -90,55 +90,3 @@ function(clang_format TARGET_NAME)
   endif()
 endfunction()
 
-#
-# cmake-format
-#
-find_program(CMAKE_FORMAT_EXE "cmake-format")
-mark_as_advanced(FORCE CMAKE_FORMAT_EXE)
-if(CMAKE_FORMAT_EXE)
-  message(STATUS "cmake-format found: ${CMAKE_FORMAT_EXE}")
-else()
-  message(STATUS "cmake-format not found!")
-endif()
-
-# When called, this function will call 'cmake-format' program on all listed
-# files (if both the program and the files exist and are found)
-# ~~~
-# Required:
-# TARGET_NAME - The name of the target to create.
-#
-# Optional:
-# ARGN - Any  arguments passed in will be considered as 'files' to perform the
-# formatting on. Any items that are not files will be ignored. Both relative and
-# absolute paths are accepted.
-# ~~~
-function(cmake_format TARGET_NAME)
-  if(CMAKE_FORMAT_EXE)
-    set(FORMAT_FILES)
-    # Determine files that exist
-    foreach(iter IN LISTS ARGN)
-      if(EXISTS ${iter})
-        set(FORMAT_FILES ${FORMAT_FILES} ${iter})
-      elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${iter})
-        set(FORMAT_FILES ${FORMAT_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/${iter})
-      endif()
-    endforeach()
-
-    # Generate target
-    if(FORMAT_FILES)
-      if(TARGET ${TARGET_NAME})
-        message(
-          ERROR
-          "Cannot create cmake-format target '${TARGET_NAME}', already exists.")
-      else()
-        add_custom_target(${TARGET_NAME} COMMAND ${CMAKE_FORMAT_EXE} -i
-                                                 ${FORMAT_FILES})
-
-        if(NOT TARGET cmake-format)
-          add_custom_target(cmake-format)
-        endif()
-        add_dependencies(cmake-format ${TARGET_NAME})
-      endif()
-    endif()
-  endif()
-endfunction()
diff --git a/config/sanitizer/tools.cmake b/config/sanitizer/tools.cmake
index 2f73cce..242e33f 100644
--- a/config/sanitizer/tools.cmake
+++ b/config/sanitizer/tools.cmake
@@ -111,4 +111,4 @@ else()
   set(CMAKE_CXX_CPPCHECK
       ""
       CACHE STRING "" FORCE) # delete it
-endif()
\ No newline at end of file
+endif()