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

* commit 'f4dd30f41ccee7bcd97fba065573c5201cbcc743':
  Update CMake formatting
  Update CMake files and formatting
  HDFFV-10120 verify nozlib checking with tools tests
  cmake non-code typo

1 files changed, 47 insertions, 47 deletions

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 119a6fa..70ec47f 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -707,14 +707,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")
@@ -729,10 +729,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] #####
@@ -742,41 +742,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           ############
@@ -807,17 +807,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)
@@ -832,8 +832,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 ()
 ###################################################################
 
 ###################################################################
@@ -866,24 +866,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}")
@@ -897,45 +897,45 @@ 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 ()
 
 HDF5options.cmake:
 #############################################################################################