Synchronize cmake files with develop

5 files changed, 284 insertions, 266 deletions

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index 0ecef6b..bf9e633 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -117,8 +117,12 @@ endif ()
 #-----------------------------------------------------------------------------
 # Initialize the CTEST commands
 #------------------------------
+set(CTEST_CONFIGURE_TOOLSET  "")
+if(CMAKE_GENERATOR_TOOLSET)
+  set(CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+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}\""
+    "${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}\""
 )
 #-----------------------------------------------------------------------------
 
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index fb6a15b..0f23598 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -16,88 +16,91 @@ 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@")
+if()
+  set(CMAKE_GENERATOR_TOOLSET "@GENERATOR_TOOLSET@"
+endif()
+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; HDF5Examples
-if (DEFINED CTEST_SCRIPT_ARG)
+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 ()
+  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}")
+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 INSTALLDIR)
+  set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
+endif()
 
-if (NOT DEFINED CTEST_SOURCE_NAME)
-  set (CTEST_SOURCE_NAME "HDF5Examples")
-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 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-0.2.4-Source")
-#endif ()
+#if(NOT DEFINED TAR_SOURCE)
+#  set(CTEST_USE_TAR_SOURCE "HDF5Examples-0.2.4-Source")
+#endif()
 
 ###############################################################################################################
-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@")
+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
 #
 ###############################################################################################################
 
-if (WIN32)
-  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
-  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
-else ()
-  include (${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
-  include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
-endif ()
+if(WIN32)
+  include(${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
+  include(${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
+else()
+  include(${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
+  include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
+endif()
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in
index c3e3165..de480a4 100644
--- a/config/cmake/README.txt.cmake.in
+++ b/config/cmake/README.txt.cmake.in
@@ -34,6 +34,8 @@ To test the installation with the examples;
     Create a directory to run the examples.
     Copy HDF5Examples folder to this directory.
     Copy HDF518_Examples.cmake to this directory.
+    Copy HDF5_Examples_options.cmake to this directory.
+    Copy CTestScript.cmake to this directory.
     The default source folder is defined as "HDF5Examples". It can be changed
         with the CTEST_SOURCE_NAME script option.
     The default installation folder is defined as "@CMAKE_INSTALL_PREFIX@".
diff --git a/config/cmake/scripts/HDF518config.cmake b/config/cmake/scripts/HDF518config.cmake
index 838768f..eb79996 100755
--- a/config/cmake/scripts/HDF518config.cmake
+++ b/config/cmake/scripts/HDF518config.cmake
@@ -12,10 +12,10 @@
 #############################################################################################

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

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

-### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf518.log      ###

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

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

 

-cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)

+cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)

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

 # Usage:

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

@@ -32,13 +32,13 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
 #     INSTALLDIR  -  root folder where hdf5 is installed

 #     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc

 #     CTEST_SOURCE_NAME  -  source folder

-#     STATIC_LIBRARIES  -  Build/use static libraries

+#     STATIC_ONLY  -  Build/use static libraries

 #     FORTRAN_LIBRARIES -  Build/use fortran libraries

 #     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac

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

 

-set(CTEST_SOURCE_VERSION 1.8.18)

-set(CTEST_SOURCE_VERSEXT "")

+set (CTEST_SOURCE_VERSION 1.8.19)

+set (CTEST_SOURCE_VERSEXT "")

 

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

 # handle input parameters to script.

@@ -46,232 +46,232 @@ set(CTEST_SOURCE_VERSEXT "")
 #INSTALLDIR - HDF5-1.8 root folder

 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo

 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.16

-#STATIC_LIBRARIES - Default is YES

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

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

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

+            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, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")

-else()

-  if(${BUILD_GENERATOR} STREQUAL "Unix")

-    set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS201564")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2013")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS201364")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2012")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS201264")

-    set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")

-  else()

-    message(FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")

-  endif()

-endif()

+if (NOT DEFINED BUILD_GENERATOR)

+  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")

+else ()

+  if (${BUILD_GENERATOR} STREQUAL "Unix")

+    set (CTEST_CMAKE_GENERATOR "Unix Makefiles")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2015")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS201564")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2013")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS201364")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2012")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS201264")

+    set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")

+  else ()

+    message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")

+  endif ()

+endif ()

 

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

-if(NOT DEFINED STATIC_LIBRARIES)

-    set(STATICLIBRARIES "YES")

-else()

-    set(STATICLIBRARIES "NO")

-endif()

-if(NOT DEFINED FORTRAN_LIBRARIES)

-    set(FORTRANLIBRARIES "NO")

-else()

-    set(FORTRANLIBRARIES "YES")

-endif()

+###################################################################

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

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

+if (NOT DEFINED STATIC_ONLY)

+  set (STATICONLYLIBRARIES "YES")

+else ()

+  set (STATICONLYLIBRARIES "NO")

+endif ()

+if (NOT DEFINED FORTRAN_LIBRARIES)

+  set (FORTRANLIBRARIES "NO")

+else ()

+  set(FORTRANLIBRARIES "YES")

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

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

-    set(SITE_OS_BITS "64")

-    set(SITE_COMPILER_NAME "vs2015")

-    set(SITE_COMPILER_VERSION "14")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")

-    set(SITE_OS_BITS "32")

-    set(SITE_COMPILER_NAME "vs2015")

-    set(SITE_COMPILER_VERSION "14")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS201364")

-    set(SITE_OS_BITS "64")

-    set(SITE_COMPILER_NAME "vs2013")

-    set(SITE_COMPILER_VERSION "12")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2013")

-    set(SITE_OS_BITS "32")

-    set(SITE_COMPILER_NAME "vs2013")

-    set(SITE_COMPILER_VERSION "12")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS201264")

-    set(SITE_OS_BITS "64")

-    set(SITE_COMPILER_NAME "vs2012")

-    set(SITE_COMPILER_VERSION "11")

-  elseif(${BUILD_GENERATOR} STREQUAL "VS2012")

-    set(SITE_OS_BITS "32")

-    set(SITE_COMPILER_NAME "vs2012")

-    set(SITE_COMPILER_VERSION "11")

-  endif()

+if (WIN32)

+  set (SITE_OS_NAME "Windows")

+  set (SITE_OS_VERSION "WIN7")

+  if (${BUILD_GENERATOR} STREQUAL "VS201564")

+    set (SITE_OS_BITS "64")

+    set (SITE_COMPILER_NAME "vs2015")

+    set (SITE_COMPILER_VERSION "14")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2015")

+    set (SITE_OS_BITS "32")

+    set (SITE_COMPILER_NAME "vs2015")

+    set (SITE_COMPILER_VERSION "14")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS201364")

+    set (SITE_OS_BITS "64")

+    set (SITE_COMPILER_NAME "vs2013")

+    set (SITE_COMPILER_VERSION "12")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2013")

+    set (SITE_OS_BITS "32")

+    set (SITE_COMPILER_NAME "vs2013")

+    set (SITE_COMPILER_VERSION "12")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS201264")

+    set (SITE_OS_BITS "64")

+    set (SITE_COMPILER_NAME "vs2012")

+    set (SITE_COMPILER_VERSION "11")

+  elseif (${BUILD_GENERATOR} STREQUAL "VS2012")

+    set (SITE_OS_BITS "32")

+    set (SITE_COMPILER_NAME "vs2012")

+    set (SITE_COMPILER_VERSION "11")

+  endif ()

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

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

-else()

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

-endif()

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

+set (MODEL "Experimental")

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

 

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

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

-#set(LOCAL_SUBMIT "TRUE")

+#set (LOCAL_SUBMIT "TRUE")

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

-#set(LOCAL_SKIP_TEST "TRUE")

-#set(LOCAL_MEMCHECK_TEST "TRUE")

-#set(LOCAL_COVERAGE_TEST "TRUE")

+#set (LOCAL_SKIP_TEST "TRUE")

+#set (LOCAL_MEMCHECK_TEST "TRUE")

+#set (LOCAL_COVERAGE_TEST "TRUE")

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

-#set(LOCAL_NO_PACKAGE "TRUE")

+#set (LOCAL_NO_PACKAGE "TRUE")

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

-#set(LOCAL_UPDATE "TRUE")

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

+#set (LOCAL_UPDATE "TRUE")

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

+set (REPOSITORY_BRANCH "hdf5_1_8_19")

+

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

+if (${STATICONLYLIBRARIES})

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

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

   ## following is optional to describe build                       ##

-  set(SITE_BUILDNAME_SUFFIX "STATIC")

-endif()

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

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

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

-

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

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

+endif ()

 

 ### change install prefix

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

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

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

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

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

-  endif()

-else()

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

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

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

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

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

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

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

-      endif()

-    endif()

-  endif()

-endif()

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

diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 5cc1046..64f6f8d 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -247,21 +247,30 @@ macro (HDF_README_PROPERTIES target_fortran)
     elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.3")
       set (BINARY_PLATFORM "${BINARY_PLATFORM} 10")
     endif ()
-    set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
-    if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
-    else ()
-      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
+    if (CMAKE_C_COMPILER_ID MATCHES "Intel")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} Intel")
+      if (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 17")
+      else ()
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel ${CMAKE_C_COMPILER_VERSION}")
+      endif ()
+    elseif (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
+      if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
+      else ()
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
+      endif ()
     endif ()
   elseif (APPLE)
     set (BINARY_EXAMPLE_ENDING "tar.gz")