Various merges from develop (#3135)

* Merges from develop/1.14
* Fix doxygen warnings
* Fix spelling
* Fix doxygen ref
* Add braces
* Fix format
* Remove unused file

4 files changed, 23 insertions, 1 deletions

diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index f6d733f..7542e8e 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -82,6 +82,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     if (example STREQUAL "H5Ex_D_External")
       add_test (
@@ -97,6 +98,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
     endif ()
+    if (last_test)
+      set_tests_properties (JAVA_datasets-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_datasets-${example}-copy-objects
@@ -137,9 +141,10 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
           COMMAND ${CMAKE_COMMAND} -E remove
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
+    endif ()
     set_tests_properties (JAVA_datasets-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_datasets-${example}
     )
-    endif ()
+    set (last_test "JAVA_datasets-${example}-clean-objects")
   endforeach ()
 endif ()
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index 75dab75..c77a715 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -67,12 +67,16 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     add_test (
         NAME JAVA_datatypes-${example}-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
+    if (last_test)
+      set_tests_properties (JAVA_datatypes-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_datatypes-${example}-copy-objects
@@ -107,5 +111,6 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
     set_tests_properties (JAVA_datatypes-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_datatypes-${example}
     )
+    set (last_test "JAVA_datatypes-${example}-clean-objects")
   endforeach ()
 endif ()
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 5393afd..01da53c 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -66,6 +66,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit")
       if (example STREQUAL "H5Ex_G_Compact")
@@ -88,6 +89,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
           COMMAND ${CMAKE_COMMAND} -E echo "${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 exists"
       )
     endif ()
+    if (last_test)
+      set_tests_properties (JAVA_groups-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_groups-${example}-copy-objects
@@ -132,6 +136,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
       set_tests_properties (JAVA_groups-${example}-clean-objects PROPERTIES
           DEPENDS JAVA_groups-${example}
       )
+      set (last_test "JAVA_groups-${example}-clean-objects")
+    else ()
+      set (last_test "JAVA_groups-${example}")
     endif ()
   endforeach ()
 endif ()
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index b1c35bc..518bbf8 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -56,12 +56,16 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     add_test (
         NAME JAVA_intro-${example}-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
+    if (last_test)
+      set_tests_properties (JAVA_intro-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_intro-${example}-copy-objects
@@ -97,6 +101,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
     set_tests_properties (JAVA_intro-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_intro-${example}
     )
+    set (last_test "JAVA_intro-${example}-clean-objects")
   endforeach ()
 
 endif ()