HDFFV-10138 merge app framework to examples

7 files changed, 495 insertions, 354 deletions

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 2e3083b..ea2b667 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -8,7 +8,7 @@ if (WIN32)
   find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles${PF_ENV_EXT}}\\NSIS")
   if(NOT CPACK_WIX_ROOT)
     file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)
-  endif()
+  endif ()
   find_program (WIX_EXECUTABLE candle  PATHS "${CPACK_WIX_ROOT}/bin")
 endif ()
 
@@ -156,13 +156,25 @@ if (HDF5_PACK_EXAMPLES)
       USE_SOURCE_PERMISSIONS
       COMPONENT hdfdocuments
     )
-    install (
-        FILES
-            ${HDF5_SOURCE_DIR}/release_docs/USING_CMake_Examples.txt
-        DESTINATION ${HDF5_INSTALL_DATA_DIR}
-        COMPONENT hdfdocuments
-    )
   endif ()
+  install (
+      FILES
+          ${HDF5_SOURCE_DIR}/release_docs/USING_CMake_Examples.txt
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
+  install (
+      FILES
+          ${HDF_RESOURCES_DIR}/CTestScript.cmake
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
+  install (
+      FILES
+          ${HDF_RESOURCES_DIR}/HDF5_Examples_options.cmake
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/MANIFEST b/MANIFEST
index 47ed8d1..bf8fcbd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2405,5 +2405,8 @@
 ./tools/perform/CMakeTests.cmake
 
 # CMake-specific User Scripts
+./config/cmake/CTestScript.cmake
+./config/cmake/HDF5_Examples_options.cmake
 ./config/cmake/scripts/CTestScript.cmake
 ./config/cmake/scripts/HDF518config.cmake
+./config/cmake/scripts/HDF5options.cmake
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
new file mode 100644
index 0000000..d53d7a4
--- /dev/null
+++ b/config/cmake/CTestScript.cmake
@@ -0,0 +1,152 @@
+cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
+########################################################
+# 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}")
+  if (SITE_BUILDNAME_SUFFIX)
+    set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
+  endif ()
+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")
+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 ()
+  if (SITE_BUILDNAME_SUFFIX)
+    set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")
+  endif ()
+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+endif ()
+
+#-----------------------------------------------------------------------------
+# 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}")
+
+  if (NOT NO_MAC_FORTRAN)
+    # Shared fortran is not supported, build static
+    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+  else ()
+    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+  endif ()
+
+  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 or zip file provided
+  ## --------------------------
+  if (WIN32)
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${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 ()
+endif ()
+
+#-----------------------------------------------------------------------------
+## Clear the build directory
+## --------------------------
+set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
+else ()
+  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+endif ()
+
+# Use multiple CPU cores to build
+include (ProcessorCount)
+ProcessorCount (N)
+if (NOT N EQUAL 0)
+  if (NOT WIN32)
+    set (CTEST_BUILD_FLAGS -j${N})
+  endif ()
+  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Initialize the CTEST commands
+#------------------------------
+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_SOURCE_DIRECTORY}\""
+)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+## -- set output to english
+set ($ENV{LC_MESSAGES}  "en_EN")
+
+#-----------------------------------------------------------------------------
+  configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+#-----------------------------------------------------------------------------
+  ## NORMAL process
+  ## -- LOCAL_SUBMIT reports to CDash server
+  ## --------------------------
+  ctest_start (Experimental)
+  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS 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 ()
+
+  ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Test)
+  endif()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    message (FATAL_ERROR "tests FAILED")
+  endif ()
+#-----------------------------------------------------------------------------
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 4d86cf9..5732786 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -5,196 +5,88 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
 #     ctest -S HDF518_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
 
-set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
-set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
+set (CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+set (CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
 
 # handle input parameters to script.
 #INSTALLDIR - HDF5-1.8 root folder
 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
-#CTEST_SOURCE_NAME - name of source folder; HDF4Examples
-#STATIC_ONLY - Default is YES
-#FORTRAN_LIBRARIES - Default is NO
-##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
-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()
-if(NOT DEFINED INSTALLDIR)
-    set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
-endif()
-if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
-    set(CTEST_CONFIGURATION_TYPE "Release")
-endif()
-if(NOT DEFINED CTEST_SOURCE_NAME)
-    set(CTEST_SOURCE_NAME "HDF5Examples")
-endif()
-if(NOT DEFINED STATIC_ONLY)
-    set(STATICONLYLIBRARIES "YES")
-else(NOT DEFINED STATIC_ONLY)
-    set(STATICONLYLIBRARIES "NO")
-endif()
-if(NOT DEFINED FORTRAN_LIBRARIES)
-    set(FORTRANLIBRARIES "NO")
-else(NOT DEFINED FORTRAN_LIBRARIES)
-    set(FORTRANLIBRARIES "YES")
-endif()
-if(NOT DEFINED HDF_LOCAL)
-    set(CDASH_LOCAL "NO")
-else(NOT HDF_LOCAL)
-    set(CDASH_LOCAL "YES")
-endif()
+#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
+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 ()
+
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set (CTEST_CONFIGURATION_TYPE "Release")
+endif ()
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
+##################################################################
+
+if (NOT DEFINED INSTALLDIR)
+  set (INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
+endif ()
+
+if (NOT DEFINED CTEST_SOURCE_NAME)
+  set (CTEST_SOURCE_NAME "HDF5Examples")
+endif ()
+
+if (NOT DEFINED HDF_LOCAL)
+  set (CDASH_LOCAL "NO")
+else ()
+  set (CDASH_LOCAL "YES")
+endif ()
 if(NOT DEFINED CTEST_SITE)
-    set(CTEST_SITE "local")
-endif()
-if(NOT DEFINED CTEST_BUILD_NAME)
-    set(CTEST_BUILD_NAME "examples")
-endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+  set (CTEST_SITE "local")
+endif ()
+if (NOT DEFINED CTEST_BUILD_NAME)
+  set (CTEST_BUILD_NAME "examples")
+endif ()
+set (BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
 
 #TAR_SOURCE - name of tarfile
-#if(NOT DEFINED TAR_SOURCE)
-#  set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.2.1-Source")
-#endif()
+#if (NOT DEFINED TAR_SOURCE)
+#  set (CTEST_USE_TAR_SOURCE "HDF5Examples-0.2.4-Source")
+#endif ()
 
 ###############################################################################################################
-#     Adjust the following SET Commands as needed
-###############################################################################################################
-if(WIN32)
-  if(${STATICONLYLIBRARIES})
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
-  endif()
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
-  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
-  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
-  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
-else(WIN32)
-  if(${STATICONLYLIBRARIES})
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  endif()
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
-  set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
-  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
-  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
-  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
-endif(WIN32)
-if(${FORTRANLIBRARIES})
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
-else()
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
-endif()
-if(${CDASH_LOCAL})
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
+if (WIN32)
+  set (SITE_OS_NAME "Windows")
+  set (ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
+  set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
+else ()
+  set (ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
+  set (ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
+  set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
+endif ()
+if (${CDASH_LOCAL})
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
+endif ()
+set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
 #
 ###############################################################################################################
 
-#-----------------------------------------------------------------------------
-# 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}")
-  if(NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else()
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
-  endif()
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
-endif()
-
-#-----------------------------------------------------------------------------
-set(CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
-## --------------------------
-if(CTEST_USE_TAR_SOURCE)
-  ## Uncompress source if tar or zip file provided
-  ## --------------------------
-  if(WIN32)
-    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${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_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_SOURCE_NAME} failed")
-  endif()
-endif(CTEST_USE_TAR_SOURCE)
-
-#-----------------------------------------------------------------------------
-## Clear the build directory
-## --------------------------
-set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
-if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-  ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
+if (WIN32)
+  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
+  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
 else ()
-  file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+  include (${CTEST_SCRIPT_DIRECTORY}/HDF_Examples_options.cmake)
+  include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
 endif ()
-
-# Use multiple CPU cores to build
-include(ProcessorCount)
-ProcessorCount(N)
-if(NOT N EQUAL 0)
-  if(NOT WIN32)
-    set(CTEST_BUILD_FLAGS -j${N})
-  endif()
-  set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
-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_SOURCE_DIRECTORY}\""
-)
-
-#-----------------------------------------------------------------------------
-## -- set output to english
-set($ENV{LC_MESSAGES}  "en_EN")
-
-#-----------------------------------------------------------------------------
-configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
-ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
-## NORMAL process
-## --------------------------
-ctest_start (Experimental)
-ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-if(${res} LESS 0 OR ${res} GREATER 0)
-  file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
-endif()
-if(LOCAL_SUBMIT)
-  ctest_submit (PARTS Configure Notes)
-endif()
-ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND APPEND RETURN_VALUE res NUMBER_ERRORS errval)
-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(LOCAL_SUBMIT)
-  ctest_submit (PARTS Build)
-endif()
-ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
-if(${res} LESS 0 OR ${res} GREATER 0)
-  file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
-endif()
-if(LOCAL_SUBMIT)
-  ctest_submit (PARTS Test)
-endif()
-if(${res} LESS 0 OR ${res} GREATER 0)
-  message (FATAL_ERROR "tests FAILED")
-endif()
-#-----------------------------------------------------------------------------
-##############################################################################################################
-message(STATUS "DONE")
\ No newline at end of file
diff --git a/config/cmake/HDF5_Examples_options.cmake b/config/cmake/HDF5_Examples_options.cmake
new file mode 100644
index 0000000..2708f80
--- /dev/null
+++ b/config/cmake/HDF5_Examples_options.cmake
@@ -0,0 +1,45 @@
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+####  DEFAULT:                                                                            ###
+####         BUILD_SHARED_LIBS:BOOL=OFF                                                   ###
+####         HDF_BUILD_C:BOOL=ON                                                          ###
+####         HDF_BUILD_CXX:BOOL=OFF                                                       ###
+####         HDF_BUILD_FORTRAN:BOOL=OFF                                                   ###
+####         BUILD_TESTING:BOOL=OFF                                                       ###
+####         HDF_ENABLE_PARALLEL:BOOL=OFF                                                 ###
+####         HDF_ENABLE_THREADSAFE:BOOL=OFF                                               ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+### build with shared libraries
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=ON")
+
+#############################################################################################
+####      languages       ####
+### disable C builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_C:BOOL=OFF")
+
+### enable C++ builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_CXX:BOOL=ON")
+
+### enable Fortran builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+
+
+#############################################################################################
+### enable parallel program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_PARALLEL:BOOL=ON")
+
+
+#############################################################################################
+### enable threadsafe program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_THREADSAFE:BOOL=ON")
+
+
+#############################################################################################
+### enable test program builds, requires reference files in testfiles subdirectory
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCOMPARE_TESTING:BOOL=ON")
+
+#############################################################################################
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index e525078..d24eb44 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)

+cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)

 ########################################################

 # This dashboard is maintained by The HDF Group

 # For any comments please contact cdashhelp@hdfgroup.org

@@ -7,163 +7,163 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
 # -----------------------------------------------------------

 # -- Get environment

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

-if(NOT SITE_OS_NAME)

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

+  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")

+  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}")

-  if(SITE_BUILDNAME_SUFFIX)

-    set(CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")

-  endif()

-  set(BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")

-else()

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

+  if (SITE_BUILDNAME_SUFFIX)

+    set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")

+  endif ()

+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")

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

-  if(SITE_BUILDNAME_SUFFIX)

-    set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")

-  endif()

-  set(BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")

-endif()

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

+  if (SITE_BUILDNAME_SUFFIX)

+    set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")

+  endif ()

+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")

+endif ()

 

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

 # MAC machines need special option

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

-if(APPLE)

+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}")

+  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}")

 

-  if(NOT NO_MAC_FORTRAN)

-    # Shared fortran is not supported, build static 

-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")

-  else()

-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

-  endif()

+  if (NOT NO_MAC_FORTRAN)

+    # Shared fortran is not supported, build static

+    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")

+  else ()

+    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

+  endif ()

 

-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")

-endif()

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

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

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

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

+      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})

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

+        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 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

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

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

+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(NOT WIN32)

-    set(CTEST_BUILD_FLAGS -j${N})

-  endif()

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

-endif()

+include (ProcessorCount)

+ProcessorCount (N)

+if (NOT N EQUAL 0)

+  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

+list (APPEND CTEST_NOTES_FILES

     "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

     "${CMAKE_CURRENT_LIST_FILE}"

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

@@ -172,39 +172,39 @@ list(APPEND CTEST_NOTES_FILES
 #-----------------------------------------------------------------------------

 # Check for required variables.

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

-foreach(req

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

+  if (NOT DEFINED ${req})

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

+  endif ()

+endforeach ()

 

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

 # Initialize the CTEST commands

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

-if(LOCAL_MEMCHECK_TEST)

-  find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

+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_SOURCE_DIRECTORY}\""

   )

-else()

-  if(LOCAL_COVERAGE_TEST)

-    find_program(CTEST_COVERAGE_COMMAND NAMES gcov)

-  endif()

+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_SOURCE_DIRECTORY}\""

   )

-endif()

+endif ()

 

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

 ## -- set output to english

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

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

 

 # Print summary information.

-foreach(v

+foreach (v

     CTEST_SITE

     CTEST_BUILD_NAME

     CTEST_SOURCE_DIRECTORY

@@ -217,9 +217,9 @@ foreach(v
     CTEST_SCRIPT_DIRECTORY

     CTEST_USE_LAUNCHERS

   )

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

-endforeach(v)

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

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

+endforeach ()

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

 

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

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

@@ -231,63 +231,63 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
   ## -- LOCAL_COVERAGE_TEST executes code coverage process

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

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

-  if(LOCAL_UPDATE)

+  if (LOCAL_UPDATE)

     ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")

-  endif()

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

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

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

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

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

+  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_SKIP_TEST)

+    if (NOT LOCAL_MEMCHECK_TEST)

       ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)

-      if(LOCAL_SUBMIT)

+      if (LOCAL_SUBMIT)

         ctest_submit (PARTS Test)

-      endif()

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

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

-      endif()

-    else()

+      endif ()

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

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

+      endif ()

+    else ()

       ctest_memcheck (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args})

-      if(LOCAL_SUBMIT)

+      if (LOCAL_SUBMIT)

         ctest_submit (PARTS MemCheck)

-      endif()

-    endif()

-    if(LOCAL_COVERAGE_TEST)

+      endif ()

+    endif ()

+    if (LOCAL_COVERAGE_TEST)

       ctest_coverage (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)

-      if(LOCAL_SUBMIT)

+      if (LOCAL_SUBMIT)

         ctest_submit (PARTS Coverage)

-      endif()

-    endif()

-  endif(NOT LOCAL_SKIP_TEST)

+      endif ()

+    endif ()

+  endif ()

 

-  if(NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE AND NOT LOCAL_SKIP_BUILD)

+  if (NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE AND NOT LOCAL_SKIP_BUILD)

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

     ## Package the product

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

-    execute_process(COMMAND cpack -C ${CTEST_CONFIGURATION_TYPE} -V

+    execute_process (COMMAND cpack -C ${CTEST_CONFIGURATION_TYPE} -V

       WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}

       RESULT_VARIABLE cpackResult

       OUTPUT_VARIABLE cpackLog

       ERROR_VARIABLE cpackLog.err

     )

-    file(WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}")

-    if(cpackResult GREATER 0)

-      file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed packaging: ${cpackResult}:${cpackLog.err} \n")

-    endif()

-  endif()

+    file (WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}")

+    if (cpackResult GREATER 0)

+      file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed packaging: ${cpackResult}:${cpackLog.err} \n")

+    endif ()

+  endif ()

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

diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
new file mode 100644
index 0000000..6239f1f
--- /dev/null
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -0,0 +1,37 @@
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+
+#############################################################################################
+####      ext libraries       ####
+
+### ext libs from tgz
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ -DTGZPATH:PATH=${CTEST_SCRIPT_DIRECTORY}")
+### ext libs from git
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT")
+### ext libs on system
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include")
+
+### disable ext zlib building
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
+### disable ext szip building
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
+
+#############################################################################################
+### disable test program builds
+
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")
+
+#############################################################################################
+### disable packaging
+
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
+### Create install package with external libraries (szip, zlib)
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
+
+#############################################################################################