Merge mostly CMake changes from develop and file cleanup

3 files changed, 204 insertions, 181 deletions

diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 0a39568..82d63af 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -195,7 +195,22 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
 
     # Append more extra warning flags that only gcc 6.x+ know about
     if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
-      set (H5_CFLAGS4 "${H5_CFLAGS4} -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa")
+      set (H5_CFLAGS4 "${H5_CFLAGS4} -Wnull-dereference -Wunused-const-variable -Wduplicated-cond -Whsa -Wnormalized")
+    endif ()
+
+    # Append more extra warning flags that only gcc 7.x+ know about
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
+      set (H5_CFLAGS4 "${H5_CFLAGS4} -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict")
+    endif ()
+
+    # Append more extra warning flags that only gcc 8.x+ know about
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
+      set (H5_CFLAGS4 "${H5_CFLAGS4} -Wattribute-alias -Wcast-align=strict -Wshift-overflow=2 -Wno-suggest-attribute=cold -Wno-suggest-attribute=malloc")
+    endif ()
+
+    # Append more extra warning flags that only gcc 9.x+ know about
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
+      set (H5_CFLAGS4 "${H5_CFLAGS4} Wattribute-alias=2 -Wmissing-profile")
     endif ()
 
 endif ()
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index d8196b1..973c726 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -60,185 +60,192 @@ endif ()
 # build generator must be defined

 if (NOT DEFINED BUILD_GENERATOR)

   message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
-endif ()

-

-###################################################################

-### Following Line is one of [Release, RelWithDebInfo, Debug] #####

+endif ()
+
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
 ###        (default use command line -C value)
-set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")

-###################################################################

-

-if (NOT DEFINED INSTALLDIR)

-  if (WIN32)

-    set (INSTALLDIR "C:/Program Files/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")

-  else ()

-    set (INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")

-  endif ()

-endif ()

-if (NOT DEFINED CTEST_CONFIGURATION_TYPE)

-  set (CTEST_CONFIGURATION_TYPE "Release")

-endif ()

-if (NOT DEFINED CTEST_SOURCE_NAME)

-  set (CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")

-endif ()

-

-set (CTEST_BINARY_NAME "build")

-set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")

-if (WIN32)

-  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")

-  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")

-else ()

-  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")

-  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")

-endif ()

-

-###################################################################

-#########       Following describes compiler           ############

-if (WIN32)

-  set (SITE_OS_NAME "Windows")

-  set (SITE_OS_VERSION "WIN7")

-  if (${BUILD_GENERATOR} STREQUAL "VS201764")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
-    set (SITE_OS_BITS "64")
-    set (SITE_COMPILER_NAME "vs2017")
-    set (SITE_COMPILER_VERSION "15")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS2017")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
-    set (SITE_OS_BITS "32")
-    set (SITE_COMPILER_NAME "vs2017")
-    set (SITE_COMPILER_VERSION "15")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS201564")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
-    set (SITE_OS_BITS "64")
-    set (SITE_COMPILER_NAME "vs2015")
-    set (SITE_COMPILER_VERSION "14")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS2015")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
-    set (SITE_OS_BITS "32")
-    set (SITE_COMPILER_NAME "vs2015")
-    set (SITE_COMPILER_VERSION "14")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS201364")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
-    set (SITE_OS_BITS "64")
-    set (SITE_COMPILER_NAME "vs2013")
-    set (SITE_COMPILER_VERSION "12")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS2013")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
-    set (SITE_OS_BITS "32")
-    set (SITE_COMPILER_NAME "vs2013")
-    set (SITE_COMPILER_VERSION "12")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS201264")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
-    set (SITE_OS_BITS "64")
-    set (SITE_COMPILER_NAME "vs2012")
-    set (SITE_COMPILER_VERSION "11")
-  elseif (${BUILD_GENERATOR} STREQUAL "VS2012")
-    set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
-    set (SITE_OS_BITS "32")
-    set (SITE_COMPILER_NAME "vs2012")
-    set (SITE_COMPILER_VERSION "11")
+set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+###################################################################
+
+if (NOT DEFINED INSTALLDIR)
+  if (WIN32)
+    set (INSTALLDIR "C:/Program Files/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
   else ()
-    message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+    set (INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
   endif ()
-##  Set the following to unique id your computer  ##

-  set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")

-else ()

-  set (CTEST_CMAKE_GENERATOR "Unix Makefiles")

-##  Set the following to unique id your computer  ##

-  if (APPLE)

-    set (CTEST_SITE "MAC.XXXX")

-  else ()

-    set (CTEST_SITE "LINUX.XXXX")

-  endif ()

-  if (APPLE)

-    execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)

-    execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)

-    set (ENV{CC} "${XCODE_CC}")

-    set (ENV{CXX} "${XCODE_CXX}")

-    set (CTEST_USE_LAUNCHERS        1)

-    set (RR_WARNINGS_COMMON "-Wno-format-nonliteral -Wno-cast-align -Wno-unused -Wno-unused-variable -Wno-unused-function -Wno-self-assign -Wno-unused-parameter -Wno-sign-compare")

-    set (RR_WARNINGS_C "${RR_WARNINGS_COMMON} -Wno-deprecated-declarations -Wno-uninitialized")

-    set (RR_WARNINGS_CXX "${RR_WARNINGS_COMMON} -Woverloaded-virtual -Wshadow -Wwrite-strings -Wc++11-compat")

-    set (RR_FLAGS_COMMON "-g -O0 -fstack-protector-all -D_FORTIFY_SOURCE=2")

-    set (RR_FLAGS_C "${RR_FLAGS_COMMON}")

-    set (RR_FLAGS_CXX "${RR_FLAGS_COMMON}")

-    set (ENV{CFLAGS} "${RR_WARNINGS_C} ${RR_FLAGS_C}")

-    set (ENV{CXXFLAGS} "${RR_WARNINGS_CXX} ${RR_FLAGS_CXX}")

-  endif ()

-endif ()

-###################################################################

-

-###################################################################

-#########       Following is for submission to CDash   ############

-###################################################################

+endif ()
+if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set (CTEST_CONFIGURATION_TYPE "Release")
+endif ()
+if (NOT DEFINED CTEST_SOURCE_NAME)
+  set (CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
+endif ()
+
+set (CTEST_BINARY_NAME "build")
+set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
+if (WIN32 AND NOT MINGW)
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
+else ()
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
+endif ()
+
+###################################################################
+#########       Following describes compiler           ############
+  if (NOT DEFINED BUILD_GENERATOR)
+    message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+  endif ()
+  if (WIN32 AND NOT MINGW)
+    set (SITE_OS_NAME "Windows")
+    set (SITE_OS_VERSION "WIN7")
+    if (BUILD_GENERATOR STREQUAL "VS201764")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2017")
+      set (SITE_COMPILER_VERSION "15")
+    elseif (BUILD_GENERATOR STREQUAL "VS2017")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2017")
+      set (SITE_COMPILER_VERSION "15")
+    elseif (BUILD_GENERATOR STREQUAL "VS201564")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2015")
+      set (SITE_COMPILER_VERSION "14")
+    elseif (BUILD_GENERATOR STREQUAL "VS2015")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2015")
+      set (SITE_COMPILER_VERSION "14")
+    elseif (BUILD_GENERATOR STREQUAL "VS201364")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2013")
+      set (SITE_COMPILER_VERSION "12")
+    elseif (BUILD_GENERATOR STREQUAL "VS2013")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2013")
+      set (SITE_COMPILER_VERSION "12")
+    elseif (BUILD_GENERATOR STREQUAL "VS201264")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2012")
+      set (SITE_COMPILER_VERSION "11")
+    elseif (BUILD_GENERATOR STREQUAL "VS2012")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2012")
+      set (SITE_COMPILER_VERSION "11")
+    else ()
+      message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+    endif ()
+  ##  Set the following to unique id your computer  ##
+    set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")
+  else ()
+    set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+  ##  Set the following to unique id your computer  ##
+    if (APPLE)
+     set (CTEST_SITE "MAC.XXXX")
+    else ()
+      set (CTEST_SITE "LINUX.XXXX")
+    endif ()
+    if (APPLE)
+      execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set (ENV{CC} "${XCODE_CC}")
+      set (ENV{CXX} "${XCODE_CXX}")
+      set (CTEST_USE_LAUNCHERS        1)
+      set (RR_WARNINGS_COMMON "-Wno-format-nonliteral -Wno-cast-align -Wno-unused -Wno-unused-variable -Wno-unused-function -Wno-self-assign -Wno-unused-parameter -Wno-sign-compare")
+      set (RR_WARNINGS_C "${RR_WARNINGS_COMMON} -Wno-deprecated-declarations -Wno-uninitialized")
+      set (RR_WARNINGS_CXX "${RR_WARNINGS_COMMON} -Woverloaded-virtual -Wshadow -Wwrite-strings -Wc++11-compat")
+      set (RR_FLAGS_COMMON "-g -O0 -fstack-protector-all -D_FORTIFY_SOURCE=2")
+      set (RR_FLAGS_C "${RR_FLAGS_COMMON}")
+      set (RR_FLAGS_CXX "${RR_FLAGS_COMMON}")
+      set (ENV{CFLAGS} "${RR_WARNINGS_C} ${RR_FLAGS_C}")
+      set (ENV{CXXFLAGS} "${RR_WARNINGS_CXX} ${RR_FLAGS_CXX}")
+    endif ()
+  endif ()
+###################################################################
+
+###################################################################
+#########       Following is for submission to CDash   ############
+###################################################################
 if (NOT DEFINED MODEL)
   set (MODEL "Experimental")
 endif ()
-###################################################################

-

-###################################################################

-#####       Following controls CDash submission               #####

-#set (LOCAL_SUBMIT "TRUE")

-#####       Following controls test process                   #####

-#set (LOCAL_SKIP_TEST "TRUE")

-#set (LOCAL_MEMCHECK_TEST "TRUE")

-#set (LOCAL_COVERAGE_TEST "TRUE")

-#####       Following controls cpack command                  #####

-#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_BRANCH "hdf5_1_8_22")

-

-#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows

-#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

-###################################################################

-

-

-###################################################################

-

-if (WIN32 AND NOT MINGW)

-  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")

-  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)

-  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)

-  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe")

-    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

-  endif ()

-  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi")

-    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

-  endif ()

-  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip")

-    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

-  endif ()

-else ()

-  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")

-  include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)

-  include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)

-  if (APPLE)

-    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")

-      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

-    endif ()

-    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz")

-      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

-    endif ()

-    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh")

-      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

-    endif ()

-  else ()

-    if (CYGWIN)

-      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh")

-        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

-      endif ()

-      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz")

-        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

-      endif ()

-    else ()

-      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh")

-        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

-      endif ()

-      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz")

-        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

-      endif ()

-    endif ()

-  endif ()

-endif ()

+
+###################################################################
+
+###################################################################
+#####       Following controls CDash submission               #####
+#set (LOCAL_SUBMIT "TRUE")
+#####       Following controls test process                   #####
+#set (LOCAL_SKIP_TEST "TRUE")
+#set (LOCAL_MEMCHECK_TEST "TRUE")
+#set (LOCAL_COVERAGE_TEST "TRUE")
+#####       Following controls cpack command                  #####
+#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_BRANCH "hdf5_1_10_6")
+
+#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
+#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
+###################################################################
+
+
+###################################################################
+
+if (WIN32 AND NOT MINGW)
+  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
+  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
+  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+else ()
+  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
+  include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
+  if (DEFINED HPC)
+    include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
+  endif ()
+  include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
+  if (APPLE)
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+  else ()
+    if (CYGWIN)
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+    else ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+    endif ()
+  endif ()
+endif ()
diff --git a/config/conclude.am b/config/conclude.am
index e6635d0..6e96ba2 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -16,11 +16,11 @@
 ## Textually included at the end of most HDF5 Makefiles.am.
 ## Contains build rules.
 
-# Automake needs to be taught how to build lib, dyn, progs, and tests targets.
+# Automake needs to be taught how to build lib, progs and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
 # EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
+# be built at certain times.
 LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
       $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
 PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
@@ -32,6 +32,7 @@ TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 AM_SH_LOG_FLAGS =
 REALTIMEOUTPUT = $(realtimeOutput)
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 build-lib: $(LIB)
@@ -67,7 +68,7 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
 # UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
+# is deprecated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -233,7 +234,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
 	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "Set HDF5_PARAPREFIX to use another directory. e.g.,";       \
 	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
 	    echo "    export HDF5_PARAPREFIX";                                \
 	    echo "    make check";                                            \