Merge pull request #300 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '46bd5d0d95b83e4cd703907b0d950ef1ab6b309e':
  Correct name of file
  Update cmake build scripts, split out options to seprate file

3 files changed, 114 insertions, 103 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 7657fc2..e525078 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -25,14 +25,11 @@ if(NOT SITE_OS_NAME)
   message(STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")

 

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

-  if(USE_AUTOTOOLS)

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

-  endif()

   if(SITE_BUILDNAME_SUFFIX)

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

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

   endif()

   set(BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")

-else(NOT SITE_OS_NAME)

+else()

   ## machine name provided

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

   if(CMAKE_HOST_UNIX)

@@ -44,7 +41,7 @@ else(NOT SITE_OS_NAME)
     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(NOT SITE_OS_NAME)

+endif()

 

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

 # MAC machines need special option

@@ -59,12 +56,12 @@ if(APPLE)
   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(NOT NO_MAC_FORTRAN)

+  else()

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

-  endif(NOT NO_MAC_FORTRAN)

+  endif()

 

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

-endif(APPLE)

+endif()

 

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

 set(NEED_REPOSITORY_CHECKOUT 0)

@@ -73,10 +70,10 @@ if(CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar file provided

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

   if(WIN32)

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

+    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_USE_TAR_SOURCE}.tar]")

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

 

@@ -88,7 +85,7 @@ if(CTEST_USE_TAR_SOURCE)
 

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

   set(LOCAL_SKIP_UPDATE "TRUE")

-else(CTEST_USE_TAR_SOURCE)

+else()

   if(LOCAL_UPDATE)

     if(CTEST_USE_GIT_SOURCE)

       find_program(CTEST_GIT_COMMAND NAMES git git.cmd)

@@ -109,7 +106,7 @@ else(CTEST_USE_TAR_SOURCE)
         set(CTEST_GIT_options "pull")

       endif()

       set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

-    else(CTEST_USE_GIT_SOURCE)

+    else()

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

       ## use subversion to get source

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

@@ -140,9 +137,9 @@ else(CTEST_USE_TAR_SOURCE)
           set(CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")

         endif()

       endif()

-    endif(CTEST_USE_GIT_SOURCE)

-  endif(LOCAL_UPDATE)

-endif(CTEST_USE_TAR_SOURCE)

+    endif()

+  endif()

+endif()

 

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

 ## Clear the build directory

@@ -166,22 +163,11 @@ endif()
 

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

 # Send the main script as a note.

-if(USE_AUTOTOOLS)

-  ## autotools builds need to use make and does not use the cacheinit.cmake file

-  ## -- make command

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

-  find_program(MAKE NAMES make)

-  list(APPEND CTEST_NOTES_FILES

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

-      "${CMAKE_CURRENT_LIST_FILE}"

-  )

-else()

-  list(APPEND CTEST_NOTES_FILES

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

-      "${CMAKE_CURRENT_LIST_FILE}"

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

-  )

-endif()

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

@@ -194,32 +180,25 @@ foreach(req
   if(NOT DEFINED ${req})

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

   endif()

-endforeach(req)

+endforeach()

 

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

 # Initialize the CTEST commands

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

-if(USE_AUTOTOOLS)

-  set(CTEST_CONFIGURE_COMMAND  "${CTEST_SOURCE_DIRECTORY}/configure ${ADD_BUILD_OPTIONS}")

-  set(CTEST_BUILD_COMMAND      "${MAKE} ${CTEST_BUILD_FLAGS}")

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

-  file(WRITE ${CTEST_BINARY_DIRECTORY}/CTestTestfile.cmake "ADD_TEST(makecheck \"${MAKE}\" \"${CTEST_BUILD_FLAGS}\" \"-i\" \"check\")")

-else(USE_AUTOTOOLS)

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

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

-    )

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

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

- 

+

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

 ## -- set output to english

 set($ENV{LC_MESSAGES}  "en_EN")

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 8e3b7b0..580675e 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -1,7 +1,7 @@
 #############################################################################################

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

 ### BUILD_GENERATOR required [Unix, VS2015, VS201564, VS2013, VS201364, VS2012, VS201264] ###

-### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf5.log          ###

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

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

 

 cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)

@@ -152,12 +152,28 @@ if(WIN32)
 ##  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()

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

 

@@ -178,16 +194,14 @@ set(MODEL "Experimental")
 #set(LOCAL_NO_PACKAGE "TRUE")

 #####       Following controls source update                  #####

 #set(LOCAL_UPDATE "TRUE")

-set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/trunk")

+set(REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")

+set(REPOSITORY_BRANCH "develop")

+

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

 #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

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

 

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

-####  Change default configuration of options in config/cmake/cacheinit.cmake file ###

-####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")

-

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

 if(${STATICLIBRARIES})

   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")

   #########       Following describes computer           ############

@@ -195,26 +209,15 @@ if(${STATICLIBRARIES})
   set(SITE_BUILDNAME_SUFFIX "STATIC")

 endif()

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

-

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

-#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=SVN")

-### 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 libs building

-#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")

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

 ####      fortran       ####

 if(${FORTRANLIBRARIES})

   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")

+  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")

 else()

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

+  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")

 endif()

 ####      java       ####

 if(${JAVALIBRARIES})

@@ -223,57 +226,53 @@ else()
   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")

 endif()

 

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

-set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")

-

 ### change install prefix

-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")

-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")

+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")

+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")

 

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

 

 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}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.exe")

-    file(COPY "${CTEST_BINARY_DIRECTORY}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})

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

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

   endif()

-  if(EXISTS "${CTEST_BINARY_DIRECTORY}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.msi")

-    file(COPY "${CTEST_BINARY_DIRECTORY}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.msi" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

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

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

   endif()

-  if(EXISTS "${CTEST_BINARY_DIRECTORY}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.zip")

-    file(COPY "${CTEST_BINARY_DIRECTORY}\\HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}.zip" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})

+  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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-Darwin.dmg")

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

+    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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-Darwin.tar.gz")

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

+    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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-Darwin.sh")

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

+    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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-CYGWIN.sh")

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

+      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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-CYGWIN.tar.gz")

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

+      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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-Linux.sh")

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

+      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}/HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-Linux.tar.gz")

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

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

diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
new file mode 100755
index 0000000..8f955e7
--- /dev/null
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -0,0 +1,33 @@
+#############################################################################################
+####  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, jpeg)
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
+
+#############################################################################################