HDFFV-9875 Bring changes from develop branch

1 files changed, 27 insertions, 27 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index b7aa77d..700ef15 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -17,14 +17,14 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
   elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
     if (NOT TGZPATH)
       set (TGZPATH ${HDF5_SOURCE_DIR})
-    endif (NOT TGZPATH)
+    endif ()
     set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
     set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
-  else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
+  else ()
     set (ZLIB_USE_EXTERNAL 0)
     set (SZIP_USE_EXTERNAL 0)
-  endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
-endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option for ZLib support
@@ -39,9 +39,9 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
         if (ZLIB_FOUND)
           set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
           set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_LIBRARIES})
-        endif (ZLIB_FOUND)
-      endif (NOT ZLIB_FOUND)
-    endif (NOT ZLIB_USE_EXTERNAL)
+        endif ()
+      endif ()
+    endif ()
     if (ZLIB_FOUND)
       set (H5_HAVE_FILTER_DEFLATE 1)
       set (H5_HAVE_ZLIB_H 1)
@@ -49,33 +49,33 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
       set (H5_ZLIB_HEADER "zlib.h")
       set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
       set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
-    else (ZLIB_FOUND)
+    else ()
       if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
         set (H5_HAVE_FILTER_DEFLATE 1)
         set (H5_HAVE_ZLIB_H 1)
         set (H5_HAVE_LIBZ 1)
         message (STATUS "Filter ZLIB is built")
-      else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      else ()
         message (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
-      endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    endif (ZLIB_FOUND)
-  else (NOT H5_ZLIB_HEADER)
+      endif ()
+    endif ()
+  else ()
     # This project is being called from within another and ZLib is already configured
     set (H5_HAVE_FILTER_DEFLATE 1)
     set (H5_HAVE_ZLIB_H 1)
     set (H5_HAVE_LIBZ 1)
-  endif (NOT H5_ZLIB_HEADER)
+  endif ()
   if (H5_HAVE_FILTER_DEFLATE)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DEFLATE")
-  endif (H5_HAVE_FILTER_DEFLATE)
+  endif ()
   if (BUILD_SHARED_LIBS)
     set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_SHARED_LIBRARY})
-  endif (BUILD_SHARED_LIBS)
+  endif ()
   set (LINK_LIBS ${LINK_LIBS} ${ZLIB_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
   message (STATUS "Filter ZLIB is ON")
-endif (HDF5_ENABLE_Z_LIB_SUPPORT)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option for SzLib support
@@ -90,37 +90,37 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
       if (SZIP_FOUND)
         set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
         set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_LIBRARIES})
-      endif (SZIP_FOUND)
-    endif (NOT SZIP_FOUND)
-  endif (NOT SZIP_USE_EXTERNAL)
+      endif ()
+    endif ()
+  endif ()
   if (SZIP_FOUND)
     set (H5_HAVE_FILTER_SZIP 1)
     set (H5_HAVE_SZLIB_H 1)
     set (H5_HAVE_LIBSZ 1)
     set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
     set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
-  else (SZIP_FOUND)
+  else ()
     if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
       set (H5_HAVE_FILTER_SZIP 1)
       set (H5_HAVE_SZLIB_H 1)
       set (H5_HAVE_LIBSZ 1)
       message (STATUS "Filter SZIP is built")
-    else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+    else ()
       message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
-    endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-  endif (SZIP_FOUND)
+    endif ()
+  endif ()
   if (BUILD_SHARED_LIBS)
     set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_SHARED_LIBRARY})
-  endif (BUILD_SHARED_LIBS)
+  endif ()
   set (LINK_LIBS ${LINK_LIBS} ${SZIP_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
   message (STATUS "Filter SZIP is ON")
   if (H5_HAVE_FILTER_SZIP)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")
-  endif (H5_HAVE_FILTER_SZIP)
+  endif ()
   if (HDF5_ENABLE_SZIP_ENCODING)
     set (H5_HAVE_SZIP_ENCODER 1)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} ENCODE")
-  endif (HDF5_ENABLE_SZIP_ENCODING)
-endif (HDF5_ENABLE_SZIP_SUPPORT)
+  endif ()
+endif ()