Update cmake min version and cmake command convention

1 files changed, 24 insertions, 24 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8891af7..bd73c84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.1.0)
+cmake_minimum_required (VERSION 3.2.2)
 PROJECT (HDF5_TEST)
 
 #-----------------------------------------------------------------------------
@@ -31,10 +31,10 @@ add_library (${HDF5_TEST_LIB_TARGET} STATIC ${TEST_LIB_SOURCES} ${TEST_LIB_HEADE
 TARGET_C_PROPERTIES (${HDF5_TEST_LIB_TARGET} STATIC " " " ")
 if (MSVC)
   target_link_libraries (${HDF5_TEST_LIB_TARGET} "ws2_32.lib")
-endif (MSVC)
+endif ()
 if (MINGW)
   target_link_libraries (${HDF5_TEST_LIB_TARGET} "wsock32.lib")
-endif (MINGW)
+endif ()
 target_link_libraries (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} STATIC)
 set_target_properties (${HDF5_TEST_LIB_TARGET} PROPERTIES
@@ -47,10 +47,10 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (${HDF5_TEST_LIBSH_TARGET} SHARED " " " ")
   if (MSVC)
     target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "ws2_32.lib")
-  endif (MSVC)
+  endif ()
   if (MINGW)
     target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "wsock32.lib")
-  endif (MINGW)
+  endif ()
   target_link_libraries (${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   H5_SET_LIB_OPTIONS (${HDF5_TEST_LIBSH_TARGET} ${HDF5_TEST_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_TEST_LIBSH_TARGET} PROPERTIES
@@ -64,8 +64,8 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif (HDF5_ENABLE_THREADSAFE)
-endif (BUILD_SHARED_LIBS)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # If plugin library tests can be tested
@@ -110,7 +110,7 @@ endif (BUILD_SHARED_LIBS)
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir1/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
-  endforeach (test_lib ${TEST_PLUGIN_LIBS})
+  endforeach ()
 
   foreach (test_lib ${TEST2_PLUGIN_LIBS})
     set (HDF5_TEST_PLUGIN_LIB_CORENAME         "${test_lib}")
@@ -136,7 +136,7 @@ endif (BUILD_SHARED_LIBS)
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir2/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
-  endforeach (test_lib ${TEST2_PLUGIN_LIBS})
+  endforeach ()
 
 set (testhdf5_SOURCES
     ${HDF5_TEST_SOURCE_DIR}/testhdf5.c
@@ -178,7 +178,7 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (testhdf5-shared SHARED " " " ")
   target_link_libraries (testhdf5-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (testhdf5-shared PROPERTIES FOLDER test)
-endif (BUILD_SHARED_LIBS)
+endif ()
 
 MACRO (ADD_H5_EXE file)
   add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
@@ -192,8 +192,8 @@ MACRO (ADD_H5_EXE file)
     TARGET_C_PROPERTIES (${file}-shared SHARED " " " ")
     target_link_libraries (${file}-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
     set_target_properties (${file}-shared PROPERTIES FOLDER test)
-  endif (BUILD_SHARED_LIBS)
-ENDMACRO (ADD_H5_EXE file)
+  endif ()
+ENDMACRO ()
 
 set (H5_TESTS
     cache
@@ -253,7 +253,7 @@ set (H5_TESTS
 
 foreach (test ${H5_TESTS})
   ADD_H5_EXE(${test})
-endforeach (test ${H5_TESTS})
+endforeach ()
 
 set (H5_SWMR_TESTS
     swmr_check_compat_vfd
@@ -261,7 +261,7 @@ set (H5_SWMR_TESTS
 
 foreach (test ${H5_SWMR_TESTS})
   ADD_H5_EXE(${test})
-endforeach (test ${H5_SWMR_TESTS})
+endforeach ()
 
 ##############################################################################
 ##############################################################################
@@ -286,8 +286,8 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif (HDF5_ENABLE_THREADSAFE)
-endif (BUILD_SHARED_LIBS)
+  endif ()
+endif ()
 
 #-- Adding test for ttsafe
 add_executable (ttsafe
@@ -318,8 +318,8 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif (HDF5_ENABLE_THREADSAFE)
-endif (BUILD_SHARED_LIBS)
+  endif ()
+endif ()
 
 set (H5_CHECK_TESTS
     error_test
@@ -332,7 +332,7 @@ set (H5_CHECK_TESTS
 
 foreach (test ${H5_CHECK_TESTS})
   ADD_H5_EXE(${test})
-endforeach (test ${H5_CHECK_TESTS})
+endforeach ()
 
 #-- Adding test for accum_swmr_reader
 #   This has to be copied to the test directory for execve() to find it
@@ -347,7 +347,7 @@ set_target_properties (accum_swmr_reader PROPERTIES FOLDER test)
 set_target_properties (accum PROPERTIES DEPENDS accum_swmr_reader)
 if (BUILD_SHARED_LIBS)
   set_target_properties (accum-shared PROPERTIES DEPENDS accum_swmr_reader)
-endif (BUILD_SHARED_LIBS)
+endif ()
 
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
@@ -355,9 +355,9 @@ file (WRITE ${GREP_RUNNER}
   "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
 if (\${TEST_RESULT} STREQUAL \"0\")
   message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
-else (\${TEST_RESULT} STREQUAL \"0\")
+else ()
   message (STATUS \"COMMAND Result: \${TEST_RESULT}\")
-endif (\${TEST_RESULT} STREQUAL \"0\")
+endif ()
 "
 )
 
@@ -370,12 +370,12 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (plugin SHARED " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
-else (BUILD_SHARED_LIBS)
+else ()
   add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c)
   TARGET_NAMING (plugin STATIC)
   TARGET_C_PROPERTIES (plugin STATIC " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
-endif (BUILD_SHARED_LIBS)
+endif ()
 
 include (CMakeTests.cmake)