Merge CMake changes from develop

3 files changed, 440 insertions, 440 deletions

diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index 14774c7..a24b2e1 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -18,16 +18,6 @@ ENABLE_LANGUAGE (Fortran)
 set (HDF_PREFIX "H5")
 include (CheckFortranFunctionExists)
 
-## Check for non-standard extenstion quadmath.h
-
-CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
-
-if (${C_HAVE_QUADMATH})
-  set(${HDF_PREFIX}_HAVE_QUADMATH_H 1)
-else ()
-  set(${HDF_PREFIX}_HAVE_QUADMATH_H 0)
-endif ()
-
 # The provided CMake Fortran macros don't provide a general compile/run function
 # so this one is used.
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 9534b1e..eb466d2 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -9,266 +9,275 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.10)

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

-# This dashboard is maintained by The HDF Group

-# For any comments please contact cdashhelp@hdfgroup.org

-#

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

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

-# -- Get environment

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

-if (NOT SITE_OS_NAME)

-  ## machine name not provided - attempt to discover with uname

-  ## -- set hostname

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

-  find_program (HOSTNAME_CMD NAMES hostname)

-  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)

-  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")

-  find_program (UNAME NAMES uname)

-  macro (getuname name flag)

-    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")

-  endmacro ()

-

-  getuname (osname -s)

-  getuname (osrel  -r)

-  getuname (cpu    -m)

-  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")

-

-  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")

-else ()

-  ## machine name provided

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

-  if (CMAKE_HOST_UNIX)

-    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")

-  else ()

-    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")

-  endif ()

-endif ()

+cmake_minimum_required (VERSION 3.10)
+########################################################
+# This dashboard is maintained by The HDF Group
+# For any comments please contact cdashhelp@hdfgroup.org
+#
+########################################################
+# -----------------------------------------------------------
+# -- Get environment
+# -----------------------------------------------------------
+if (NOT SITE_OS_NAME)
+  ## machine name not provided - attempt to discover with uname
+  ## -- set hostname
+  ## --------------------------
+  find_program (HOSTNAME_CMD NAMES hostname)
+  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (UNAME NAMES uname)
+  macro (getuname name flag)
+    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+  endmacro ()
+
+  getuname (osname -s)
+  getuname (osrel  -r)
+  getuname (cpu    -m)
+  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
+
+  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
+else ()
+  ## machine name provided
+  ## --------------------------
+  if (CMAKE_HOST_UNIX)
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")
+  else ()
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")
+  endif ()
+endif ()
 if (SITE_BUILDNAME_SUFFIX)
   set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
 endif ()
 set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
-

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

-# MAC machines need special option

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

-if (APPLE)

-  # Compiler choice

-  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 (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")

-endif ()

-

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

-set (NEED_REPOSITORY_CHECKOUT 0)

-set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")

-if (CTEST_USE_TAR_SOURCE)

-  ## Uncompress source if tar file provided

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

-  if (WIN32)

-    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")

-    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)

-  else ()

-    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")

-    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)

-  endif ()

-

-  if (NOT rv EQUAL 0)

-    message (STATUS "extracting... [error-(${rv}) clean up]")

-    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")

-    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")

-  endif ()

-

-  file (RENAME ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE} ${CTEST_SOURCE_DIRECTORY})

-  set (LOCAL_SKIP_UPDATE "TRUE")

-else ()

-  if (LOCAL_UPDATE)

-    if (CTEST_USE_GIT_SOURCE)

-      find_program (CTEST_GIT_COMMAND NAMES git git.cmd)

-      set (CTEST_GIT_UPDATE_OPTIONS)

-

-      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")

-        set (NEED_REPOSITORY_CHECKOUT 1)

-      endif ()

-

-      if (${NEED_REPOSITORY_CHECKOUT})

-        if (REPOSITORY_BRANCH)

-          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

-        else ()

-          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

-        endif ()

-        set (CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")

-      else ()

-        set (CTEST_GIT_options "pull")

-      endif ()

-      set (CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

-    else ()

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

-      ## use subversion to get source

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

-      ## cygwin does not handle the find_package() call

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

-      set (CTEST_UPDATE_COMMAND "SVNCommand")

-      if (NOT SITE_CYGWIN})

-        find_package (Subversion)

-        set (CTEST_SVN_COMMAND "${Subversion_SVN_EXECUTABLE}")

-        set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")

-      else ()

-        set (CTEST_SVN_COMMAND "/usr/bin/svn")

-        set (CTEST_UPDATE_COMMAND "/usr/bin/svn")

-      endif ()

-

-      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")

-        set (NEED_REPOSITORY_CHECKOUT 1)

-      endif ()

-

-      if (NOT CTEST_REPO_VERSION)

-        set (CTEST_REPO_VERSION "HEAD")

-      endif ()

-      if (${NEED_REPOSITORY_CHECKOUT})

-        set (CTEST_CHECKOUT_COMMAND

-            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")

-      else ()

-        if (CTEST_REPO_VERSION)

-          set (CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")

-        endif ()

-      endif ()

-    endif ()

-  endif ()

-endif ()

-

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

-## Clear the build directory

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

-set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)

-if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")

-  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")

-else ()

-  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})

-endif ()

-

-# Use multiple CPU cores to build

-include (ProcessorCount)

-ProcessorCount (N)

+
+#-----------------------------------------------------------------------------
+# MAC machines need special option
+#-----------------------------------------------------------------------------
+if (APPLE)
+  # Compiler choice
+  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 (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
+endif ()
+
+#-----------------------------------------------------------------------------
+set (NEED_REPOSITORY_CHECKOUT 0)
+set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
+if (CTEST_USE_TAR_SOURCE)
+  ## Uncompress source if tar file provided
+  ## --------------------------
+  if (WIN32)
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
+  else ()
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
+  endif ()
+
+  if (NOT rv EQUAL 0)
+    message (STATUS "extracting... [error-(${rv}) clean up]")
+    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
+    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")
+  endif ()
+
+  file (RENAME ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE} ${CTEST_SOURCE_DIRECTORY})
+  set (LOCAL_SKIP_UPDATE "TRUE")
+else ()
+  if (LOCAL_UPDATE)
+    if (CTEST_USE_GIT_SOURCE)
+      find_program (CTEST_GIT_COMMAND NAMES git git.cmd)
+      set (CTEST_GIT_UPDATE_OPTIONS)
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (${NEED_REPOSITORY_CHECKOUT})
+        if (REPOSITORY_BRANCH)
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        else ()
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        endif ()
+        set (CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")
+      else ()
+        set (CTEST_GIT_options "pull")
+      endif ()
+      set (CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")
+    else ()
+      ## --------------------------
+      ## use subversion to get source
+      #-----------------------------------------------------------------------------
+      ## cygwin does not handle the find_package() call
+      ## --------------------------
+      set (CTEST_UPDATE_COMMAND "SVNCommand")
+      if (NOT SITE_CYGWIN})
+        find_package (Subversion)
+        set (CTEST_SVN_COMMAND "${Subversion_SVN_EXECUTABLE}")
+        set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")
+      else ()
+        set (CTEST_SVN_COMMAND "/usr/bin/svn")
+        set (CTEST_UPDATE_COMMAND "/usr/bin/svn")
+      endif ()
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (NOT CTEST_REPO_VERSION)
+        set (CTEST_REPO_VERSION "HEAD")
+      endif ()
+      if (${NEED_REPOSITORY_CHECKOUT})
+        set (CTEST_CHECKOUT_COMMAND
+            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")
+      else ()
+        if (CTEST_REPO_VERSION)
+          set (CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")
+        endif ()
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+## Clear the build directory
+## --------------------------
+set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")
+  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+else ()
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
+endif ()
+
+# Use multiple CPU cores to build
+include (ProcessorCount)
+ProcessorCount (N)
 if (NOT N EQUAL 0)
   if (MAX_PROC_COUNT)
     if (N GREATER MAX_PROC_COUNT)
       set (N ${MAX_PROC_COUNT})
     endif ()
   endif ()
-  if (NOT WIN32)

-    set (CTEST_BUILD_FLAGS -j${N})

-  endif ()

-  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})

-endif ()

-

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

-# Send the main script as a note.

-list (APPEND CTEST_NOTES_FILES

-    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

-    "${CMAKE_CURRENT_LIST_FILE}"

-    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"

-)

-

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

-# Check for required variables.

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

-foreach (req

-    CTEST_CMAKE_GENERATOR

-    CTEST_SITE

-    CTEST_BUILD_NAME

-  )

-  if (NOT DEFINED ${req})

-    message (FATAL_ERROR "The containing script must set ${req}")

-  endif ()

-endforeach ()

-

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

-# Initialize the CTEST commands

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

-if (CMAKE_GENERATOR_TOOLSET)

-  set (CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")

-else ()

-  set (CTEST_CONFIGURE_TOOLSET  "")

-endif()

-if (LOCAL_MEMCHECK_TEST)

-  find_program (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

-else ()

-  if (LOCAL_COVERAGE_TEST)

-    find_program (CTEST_COVERAGE_COMMAND NAMES gcov)

-  endif ()

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

-endif ()

-

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

-## -- set output to english

-set ($ENV{LC_MESSAGES}  "en_EN")

-

-# Print summary information.

-foreach (v

-    CTEST_SITE

-    CTEST_BUILD_NAME

-    CTEST_SOURCE_DIRECTORY

-    CTEST_BINARY_DIRECTORY

-    CTEST_CMAKE_GENERATOR

-    CTEST_CONFIGURATION_TYPE

-    CTEST_GIT_COMMAND

-    CTEST_CHECKOUT_COMMAND

-    CTEST_CONFIGURE_COMMAND

-    CTEST_SCRIPT_DIRECTORY

-    CTEST_USE_LAUNCHERS

-  )

-  set (vars "${vars}  ${v}=[${${v}}]\n")

-endforeach ()

-message (STATUS "Dashboard script configuration:\n${vars}\n")

-

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

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

-  ## NORMAL process

-  ## -- LOCAL_UPDATE updates the source folder from svn

-  ## -- LOCAL_SUBMIT reports to CDash server

-  ## -- LOCAL_SKIP_TEST skips the test process (only builds)

-  ## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing

-  ## -- LOCAL_COVERAGE_TEST executes code coverage process

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

-  ctest_start (${MODEL} TRACK ${MODEL})

-  if (LOCAL_UPDATE)

-    ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")

-  endif ()

-  configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)

-  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")

-  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)

-  if (LOCAL_SUBMIT)

-    ctest_submit (PARTS Update Configure Notes)

-  endif ()

-  if (${res} LESS 0 OR ${res} GREATER 0)

-    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")

-  endif ()

-

-  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)

-  if (LOCAL_SUBMIT)

-    ctest_submit (PARTS Build)

-  endif ()

-  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)

-    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")

-  endif ()

-

-  if (NOT LOCAL_SKIP_TEST)

-    if (NOT LOCAL_MEMCHECK_TEST)

+  if (NOT WIN32)
+    set (CTEST_BUILD_FLAGS -j${N})
+  endif ()
+  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Send the main script as a note.
+list (APPEND CTEST_NOTES_FILES
+    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
+    "${CMAKE_CURRENT_LIST_FILE}"
+    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"
+)
+
+#-----------------------------------------------------------------------------
+# Check for required variables.
+# --------------------------
+foreach (req
+    CTEST_CMAKE_GENERATOR
+    CTEST_SITE
+    CTEST_BUILD_NAME
+  )
+  if (NOT DEFINED ${req})
+    message (FATAL_ERROR "The containing script must set ${req}")
+  endif ()
+endforeach ()
+
+#-----------------------------------------------------------------------------
+# Initialize the CTEST commands
+#------------------------------
+if (CMAKE_GENERATOR_TOOLSET)
+  set (CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+else ()
+  set (CTEST_CONFIGURE_TOOLSET  "")
+endif()
+if (LOCAL_MEMCHECK_TEST)
+  find_program (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+else ()
+  if (LOCAL_COVERAGE_TEST)
+    find_program (CTEST_COVERAGE_COMMAND NAMES gcov)
+  endif ()
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+## -- set output to english
+set ($ENV{LC_MESSAGES}  "en_EN")
+
+# Print summary information.
+foreach (v
+    CTEST_SITE
+    CTEST_BUILD_NAME
+    CTEST_SOURCE_DIRECTORY
+    CTEST_BINARY_DIRECTORY
+    CTEST_CMAKE_GENERATOR
+    CTEST_CONFIGURATION_TYPE
+    CTEST_GIT_COMMAND
+    CTEST_CHECKOUT_COMMAND
+    CTEST_CONFIGURE_COMMAND
+    CTEST_SCRIPT_DIRECTORY
+    CTEST_USE_LAUNCHERS
+  )
+  set (vars "${vars}  ${v}=[${${v}}]\n")
+endforeach ()
+message (STATUS "Dashboard script configuration:\n${vars}\n")
+
+#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
+  ## NORMAL process
+  ## -- LOCAL_UPDATE updates the source folder from svn
+  ## -- LOCAL_SUBMIT reports to CDash server
+  ## -- LOCAL_SKIP_TEST skips the test process (only builds)
+  ## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing
+  ## -- LOCAL_COVERAGE_TEST executes code coverage process
+  ## --------------------------
+  ctest_start (${MODEL} TRACK ${MODEL})
+  if (LOCAL_UPDATE)
+    ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
+  endif ()
+  configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Update Configure Notes)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
+  endif ()
+
+  # On Cray XC40, configuring fails in the Fortran section when using the craype-mic-knl module.
+  # When the configure phase is done with the craype-haswell module and the build phase is done
+  # with the craype-mic-knl module, configure succeeds and tests pass on the knl compute nodes
+  # for Intel, Cray, GCC and Clang compilers.  If the variables aren't set or if not 
+  # cross compiling, the module switch will not occur.
+  if (CMAKE_CROSSCOMPILING AND COMPILENODE_HWCOMPILE_MODULE AND COMPUTENODE_HWCOMPILE_MODULE)
+      execute_process (COMMAND module switch ${COMPILENODE_HWCOMPILE_MODULE} ${COMPUTENODE_HWCOMPILE_MODULE})
+  endif ()
+
+  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Build)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
+  endif ()
+
+  if (NOT LOCAL_SKIP_TEST)
+    if (NOT LOCAL_MEMCHECK_TEST)
       if (NOT LOCAL_BATCH_TEST)
         ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
       else ()
         file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
-        execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME})
+        execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
         message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
         execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
         while(result)
@@ -281,8 +290,9 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
           endif ()
           message(STATUS "Found ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml for serial tests. Renaming to SerialTest.xml")
           file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
+          file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}.log ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}_Serial.log)
           unset(result CACHE)
-          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
           message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
           execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
           while(result)
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index b175ea1..f9b6401 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -9,92 +9,92 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-#############################################################################################

-### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###

-### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ###

-### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###

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

-

-cmake_minimum_required (VERSION 3.10)

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

-# Usage:

-#     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log

-# where valid options for OPTION are:

-#     BUILD_GENERATOR - The cmake build generator:

-#            Unix      * Unix Makefiles

+#############################################################################################
+### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###
+### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ###
+### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###
+#############################################################################################
+
+cmake_minimum_required (VERSION 3.10)
+############################################################################
+# Usage:
+#     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
+# where valid options for OPTION are:
+#     BUILD_GENERATOR - The cmake build generator:
+#            Unix      * Unix Makefiles
 #            VS2017    * Visual Studio 15 2017
 #            VS201764  * Visual Studio 15 2017 Win64
-#            VS2015    * Visual Studio 14 2015

-#            VS201564  * Visual Studio 14 2015 Win64

-#            VS2013    * Visual Studio 12 2013

-#            VS201364  * Visual Studio 12 2013 Win64

-#

-#     INSTALLDIR  -  root folder where hdf5 is installed

-#     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc

-#     CTEST_SOURCE_NAME  -  source folder

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

-

-set (CTEST_SOURCE_VERSION "1.10.5")

-set (CTEST_SOURCE_VERSEXT "-snap1")

-

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

-# handle input parameters to script.

-#BUILD_GENERATOR - which CMake generator to use, required

-#INSTALLDIR - HDF5-1.10.0 root folder

-#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo

-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0

-if (DEFINED CTEST_SCRIPT_ARG)

-    # transform ctest script arguments of the form

-    # script.ctest,var1=value1,var2=value2

-    # to variables with the respective names set to the respective values

-    string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")

-    foreach (current_var ${script_args})

-        if ("${current_var}" MATCHES "^([^=]+)=(.+)$")

-            set ("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")

-        endif ()

-    endforeach ()

-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] #####

+#            VS2015    * Visual Studio 14 2015
+#            VS201564  * Visual Studio 14 2015 Win64
+#            VS2013    * Visual Studio 12 2013
+#            VS201364  * Visual Studio 12 2013 Win64
+#
+#     INSTALLDIR  -  root folder where hdf5 is installed
+#     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc
+#     CTEST_SOURCE_NAME  -  source folder
+##############################################################################
+
+set (CTEST_SOURCE_VERSION "1.10.5")
+set (CTEST_SOURCE_VERSEXT "-snap1")
+
+##############################################################################
+# handle input parameters to script.
+#BUILD_GENERATOR - which CMake generator to use, required
+#INSTALLDIR - HDF5-1.10.0 root folder
+#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0
+if (DEFINED CTEST_SCRIPT_ARG)
+    # transform ctest script arguments of the form
+    # script.ctest,var1=value1,var2=value2
+    # to variables with the respective names set to the respective values
+    string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
+    foreach (current_var ${script_args})
+        if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
+            set ("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+        endif ()
+    endforeach ()
+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] #####
 ###        (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")

+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")
@@ -138,103 +138,103 @@ if (WIN32)
   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   ############

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

-set (MODEL "Experimental")

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

-

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

-#####       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_4")

-

-#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)

-  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 ()

+##  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   ############
+###################################################################
+set (MODEL "Experimental")
+###################################################################
+
+###################################################################
+#####       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_4")
+
+#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)
+  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 ()