Update CMake files and formatting

2 files changed, 215 insertions, 215 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index e525078..dca9631 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)

+  if (CMAKE_HOST_UNIX)

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

-  else()

+  else ()

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

-  endif()

-  if(SITE_BUILDNAME_SUFFIX)

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

+  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/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 158290c..55fecfb 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -48,14 +48,14 @@ if(DEFINED CTEST_SCRIPT_ARG)
     foreach(current_var ${script_args})

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

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

-        endif()

-    endforeach()

-endif()

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

+else ()

   if(${BUILD_GENERATOR} STREQUAL "Unix")

     set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

   elseif(${BUILD_GENERATOR} STREQUAL "VS2015")

@@ -70,10 +70,10 @@ else()
     set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")

   elseif(${BUILD_GENERATOR} STREQUAL "VS201264")

     set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")

-  else()

+  else ()

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

-  endif()

-endif()

+  endif ()

+endif ()

 

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

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

@@ -83,41 +83,41 @@ 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()

+  else ()

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

-  endif()

-endif()

+  endif ()

+endif ()

 if(NOT DEFINED CTEST_CONFIGURATION_TYPE)

     set(CTEST_CONFIGURATION_TYPE "Release")

-endif()

+endif ()

 if(NOT DEFINED CTEST_SOURCE_NAME)

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

-endif()

+endif ()

 if(NOT DEFINED STATIC_ONLY)

     set(STATICONLYLIBRARIES "YES")

-else()

+else ()

     set(STATICONLYLIBRARIES "NO")

-endif()

+endif ()

 if(NOT DEFINED FORTRAN_LIBRARIES)

     set(FORTRANLIBRARIES "NO")

-else()

+else ()

     set(FORTRANLIBRARIES "YES")

-endif()

+endif ()

 if(NOT DEFINED JAVA_LIBRARIES)

     set(JAVALIBRARIES "NO")

-else()

+else ()

     set(JAVALIBRARIES "YES")

-endif()

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

+else ()

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

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

-endif()

+endif ()

 

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

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

@@ -148,17 +148,17 @@ if(WIN32)
     set(SITE_OS_BITS "32")

     set(SITE_COMPILER_NAME "vs2012")

     set(SITE_COMPILER_VERSION "11")

-  endif()

+  endif ()

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

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

-else()

+else ()

   set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

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

   if(APPLE)

     set(CTEST_SITE "MAC.XXXX")

-  else()

+  else ()

     set(CTEST_SITE "LINUX.XXXX")

-  endif()

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

@@ -173,8 +173,8 @@ else()
     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()

+  endif ()

+endif ()

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

 

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

@@ -207,24 +207,24 @@ if(${STATICONLYLIBRARIES})
   #########       Following describes computer           ############

   ## following is optional to describe build                       ##

   set(SITE_BUILDNAME_SUFFIX "STATIC")

-endif()

+endif ()

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

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

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

+endif ()

 ####      java       ####

 if(${JAVALIBRARIES})

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

-else()

+else ()

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

-endif()

+endif ()

 

 ### change install prefix

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

@@ -238,42 +238,42 @@ if(WIN32)
   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()

+  endif ()

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

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

-  endif()

+  endif ()

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

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

-  endif()

-else()

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

+    endif ()

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

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

-    endif()

+    endif ()

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

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

-    endif()

-  else()

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

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

+      endif ()

+    else ()

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

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

-      endif()

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

+      endif ()

+    endif ()

+  endif ()

+endif ()