Update cmake min version and cmake command convention

1 files changed, 18 insertions, 18 deletions

diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 3a69359..b97c638 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.1.0)
+cmake_minimum_required (VERSION 3.2.2)
 PROJECT (HDFJAVA_EXAMPLES_DATASETS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
@@ -31,16 +31,16 @@ set (HDF_JAVA_EXAMPLES
 
 if (WIN32)
   set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
-else (WIN32)
+else ()
   set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
-endif (WIN32)
+endif ()
 
 set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_JARS}")
 
 set (CMAKE_JAVA_CLASSPATH ".")
 foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
-endforeach (CMAKE_INCLUDE_PATH)
+endforeach ()
 
 foreach (example ${HDF_JAVA_EXAMPLES})
   file (WRITE ${PROJECT_BINARY_DIR}/${example}_Manifest.txt
@@ -52,14 +52,14 @@ foreach (example ${HDF_JAVA_EXAMPLES})
 #  install_jar (${example} ${HJAVA_INSTALL_DATA_DIR}/examples examples)
   get_target_property (${example}_CLASSPATH ${example} CLASSDIR)
   add_dependencies (${example} ${HDF5_JAVA_HDF5_LIB_TARGET})
-endforeach (example ${HDF_JAVA_EXAMPLES})
+endforeach ()
 
 set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_NOP_JAR}")
 
 set (CMAKE_JAVA_CLASSPATH ".")
 foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
-endforeach (HDFJAVA_JAR)
+endforeach ()
 
 MACRO (ADD_H5_TEST resultfile resultcode)
   if (CMAKE_BUILD_TYPE MATCHES Debug)
@@ -68,7 +68,7 @@ MACRO (ADD_H5_TEST resultfile resultcode)
     else()
       set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
     endif()
-  endif(CMAKE_BUILD_TYPE MATCHES Debug)
+  endif()
   add_test (
       NAME JAVA_datasets-${resultfile}
       COMMAND "${CMAKE_COMMAND}"
@@ -85,16 +85,16 @@ MACRO (ADD_H5_TEST resultfile resultcode)
   )
   if (NOT "${last_test}" STREQUAL "")
     set_tests_properties (JAVA_datasets-${resultfile} PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
+  endif ()
   set (last_test "JAVA_datasets-${resultfile}")
-ENDMACRO (ADD_H5_TEST file)
+ENDMACRO ()
 
 if (BUILD_TESTING)
 
 # detect whether the encoder is present.
   if (H5_HAVE_FILTER_DEFLATE)
     set (USE_FILTER_DEFLATE "true")
-  endif (H5_HAVE_FILTER_DEFLATE)
+  endif ()
 
   if (H5_HAVE_FILTER_SZIP)
     set (USE_FILTER_SZIP "true")
@@ -109,17 +109,17 @@ if (BUILD_TESTING)
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.data
       )
-    else (${example} STREQUAL "H5Ex_D_External")
+    else ()
       add_test (
           NAME JAVA_datasets-${example}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
-    endif (${example} STREQUAL "H5Ex_D_External")
+    endif ()
     if (NOT "${last_test}" STREQUAL "")
       set_tests_properties (JAVA_datasets-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
+    endif ()
     add_test (
         NAME JAVA_datasets-${example}-copy-objects
         COMMAND    ${CMAKE_COMMAND}
@@ -132,10 +132,10 @@ if (BUILD_TESTING)
     if (${example} STREQUAL "H5Ex_D_Szip")
       if (USE_FILTER_SZIP)
         ADD_H5_TEST (${example} 0)
-      endif (USE_FILTER_SZIP)
-    else (${example} STREQUAL "H5Ex_D_Szip")
+      endif ()
+    else ()
       ADD_H5_TEST (${example} 0)
-    endif (${example} STREQUAL "H5Ex_D_Szip")
+    endif ()
 
-  endforeach (example ${HDF_JAVA_EXAMPLES})
-endif (BUILD_TESTING)
+  endforeach ()
+endif ()