Merge/update CMake, presets,java and tools (#3393)

21 files changed, 195 insertions, 108 deletions

diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 9391231..2dc8012 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -17,15 +17,7 @@ add_subdirectory (src)
 
 # Build HDF5 Tools
 if (HDF5_BUILD_TOOLS)
-  #-----------------------------------------------------------------------------
-  #-- Option to build the High level Tools
-  #-----------------------------------------------------------------------------
-  if (EXISTS "${HDF5_HL_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/tools")
-    option (HDF5_BUILD_HL_TOOLS  "Build HDF5 HL Tools" ON)
-    if (HDF5_BUILD_HL_TOOLS)
-      add_subdirectory (tools)
-    endif ()
-  endif ()
+  add_subdirectory (tools)
 endif ()
 
 #-- Add High Level Examples
diff --git a/hl/Makefile.am b/hl/Makefile.am
index c9050ae..1b6b988 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -36,14 +36,10 @@ else
   TEST_DIR =
 endif
 if BUILD_TOOLS_CONDITIONAL
-if BUILD_TOOLS_HL_CONDITIONAL
   TOOLS_DIR = tools
 else
   TOOLS_DIR =
 endif
-else
-  TOOLS_DIR =
-endif
 
 ## Don't recurse into any subdirectories if HDF5 is not configured to
 ## use the HL library
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index bfad538..548dd00 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -5,7 +5,7 @@ project (HDF5_HL_CPP_EXAMPLES CXX)
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 add_executable (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
-target_include_directories (ptExampleFL PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (ptExampleFL PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (ptExampleFL STATIC)
   target_link_libraries (ptExampleFL PRIVATE
diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake
index 7564fd7..8b2b4ce 100644
--- a/hl/c++/examples/CMakeTests.cmake
+++ b/hl/c++/examples/CMakeTests.cmake
@@ -16,12 +16,16 @@
 ##############################################################################
 ##############################################################################
 # Remove any output file left over from previous test run
+set (HL_CPP_EX_PT_CLEANFILES
+            PTcppexampleFL.h5
+)
 add_test (
     NAME HL_CPP_ex_ptExampleFL-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove
-            PTcppexampleFL.h5
-            ptExampleFL.txt
+        -E remove ${HL_CPP_EX_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ex_ptExampleFL-clear-objects PROPERTIES
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -40,3 +44,12 @@ else ()
   )
 endif ()
 set_tests_properties (HL_CPP_ex_ptExampleFL PROPERTIES DEPENDS HL_CPP_ex_ptExampleFL-clear-objects)
+add_test (
+    NAME HL_CPP_ex_ptExampleFL-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_CPP_EX_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ex_ptExampleFL-clean-objects PROPERTIES
+    DEPENDS HL_CPP_ex_ptExampleFL
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index b8e1178..71a4c9b 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -11,7 +11,7 @@ set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 if (BUILD_STATIC_LIBS)
   add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES} ${HDF5_HL_CPP_HDRS})
   target_include_directories (${HDF5_HL_CPP_LIB_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
@@ -26,7 +26,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SOURCES})
   target_include_directories (${HDF5_HL_CPP_LIBSH_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 9a1d6fd..fb750dd 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -3,7 +3,7 @@ project (HDF5_HL_CPP_TEST CXX)
 
 add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
 target_compile_options(hl_ptableTest PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
-target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (hl_ptableTest STATIC)
   target_link_libraries (hl_ptableTest PRIVATE
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 5abbd47..4137270 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -15,12 +15,19 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-
+# Remove any output file left over from previous test run
+set (HL_CPP_PT_CLEANFILES
+            packettest.h5
+)
 add_test (
     NAME HL_CPP_ptableTest-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove ${example}.txt
+        -E remove ${HL_CPP_PT_CLEANFILES}
 )
+set_tests_properties (HL_CPP_ptableTest-clear-objects PROPERTIES
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+
 if (HDF5_ENABLE_USING_MEMCHECKER)
   add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
 else ()
@@ -37,3 +44,12 @@ else ()
   )
 endif ()
 set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
+add_test (
+    NAME HL_CPP_ptableTest-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_CPP_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES
+    DEPENDS HL_CPP_ptableTest
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 93ae9e8..f14d030 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -28,7 +28,7 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
-  target_include_directories (hl_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (hl_ex_${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT BUILD_SHARED_LIBS)
     TARGET_C_PROPERTIES (hl_ex_${example} STATIC)
     target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
diff --git a/hl/examples/CMakeTests.cmake b/hl/examples/CMakeTests.cmake
index 6014f6c..6a0a6e7 100644
--- a/hl/examples/CMakeTests.cmake
+++ b/hl/examples/CMakeTests.cmake
@@ -27,31 +27,45 @@ endforeach ()
 add_custom_target(hl_ex_ex_ds1_files ALL COMMENT "Copying files needed by hl_ex_ex_ds1 tests" DEPENDS ${hl_ex_ex_ds1_files_list})
 
 # Remove any output file left over from previous test run
+set (HL_EX_CLEANFILES
+    ex_lite1.h5
+    ex_lite2.h5
+    ex_lite3.h5
+    packet_table_FLexample.h5
+    ex_image1.h5
+    ex_image2.h5
+    ex_table_01.h5
+    ex_table_02.h5
+    ex_table_03.h5
+    ex_table_04.h5
+    ex_table_05.h5
+    ex_table_06.h5
+    ex_table_07.h5
+    ex_table_08.h5
+    ex_table_09.h5
+    ex_table_10.h5
+    ex_table_11.h5
+    ex_table_12.h5
+    ex_ds1.h5
+)
 add_test (
     NAME HL_ex-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove
-            ex_lite1.h5
-            ex_lite2.h5
-            ex_lite3.h5
-            packet_table_FLexample.h5
-            ex_image1.h5
-            ex_image2.h5
-            ex_table_01.h5
-            ex_table_02.h5
-            ex_table_03.h5
-            ex_table_04.h5
-            ex_table_05.h5
-            ex_table_06.h5
-            ex_table_07.h5
-            ex_table_08.h5
-            ex_table_09.h5
-            ex_table_10.h5
-            ex_table_11.h5
-            ex_table_12.h5
-            ex_ds1.h5
+        -E remove ${HL_EX_CLEANFILES}
+)
+set_tests_properties (HL_ex-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_ex-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_EX_CLEANFILES}
+)
+set_tests_properties (HL_ex-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
-set_tests_properties (HL_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_ex)
 
 foreach (example ${examples})
   if (HDF5_ENABLE_USING_MEMCHECKER)
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 6389fbe..46827b5 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -17,14 +17,28 @@
 ##############################################################################
 
 # Remove any output file left over from previous test run
+set (HL_FORTRAN_F90_EX_CLEANFILES
+    ex_ds1.h5
+    exlite.h5
+)
 add_test (
     NAME HL_FORTRAN_f90_ex-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove
-            ex_ds1.h5
-            exlite.h5
+        -E remove ${HL_FORTRAN_F90_EX_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_f90_ex-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_FORTRAN_f90_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_FORTRAN_f90_ex-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_FORTRAN_F90_EX_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_f90_ex-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_FORTRAN_f90_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
-set_tests_properties (HL_FORTRAN_f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_FORTRAN_f90_ex)
 
 foreach (example ${examples})
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -44,5 +58,6 @@ foreach (example ${examples})
   endif ()
   set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES
       FIXTURES_REQUIRED clear_HL_FORTRAN_f90_ex
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
 endforeach ()
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 538b689..5455d77 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -59,7 +59,7 @@ set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h ${HDF5_HL_
 if (BUILD_STATIC_LIBS)
   add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS})
   target_include_directories (${HDF5_HL_F90_C_LIB_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_F90_C_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
@@ -76,7 +76,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS})
   target_include_directories (${HDF5_HL_F90_C_LIBSH_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_F90_C_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
@@ -235,16 +235,19 @@ endif ()
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 
+set (mod_export_files
+    h5ds.mod
+    h5tb.mod
+    h5tb_const.mod
+    h5lt.mod
+    h5lt_const.mod
+    h5im.mod
+)
 
 if (BUILD_STATIC_LIBS)
-  set (mod_files
-      ${MOD_BUILD_DIR}/h5ds.mod
-      ${MOD_BUILD_DIR}/h5tb.mod
-      ${MOD_BUILD_DIR}/h5tb_const.mod
-      ${MOD_BUILD_DIR}/h5lt.mod
-      ${MOD_BUILD_DIR}/h5lt_const.mod
-      ${MOD_BUILD_DIR}/h5im.mod
-  )
+  foreach (mod_file ${mod_export_files})
+    set (mod_files ${mod_files} ${MOD_BUILD_DIR}/${mod_file})
+  endforeach ()
   install (
       FILES
           ${mod_files}
@@ -265,14 +268,9 @@ if (BUILD_STATIC_LIBS)
   endif ()
 endif ()
 if (BUILD_SHARED_LIBS)
-  set (modsh_files
-      ${MODSH_BUILD_DIR}/h5ds.mod
-      ${MODSH_BUILD_DIR}/h5tb.mod
-      ${MODSH_BUILD_DIR}/h5tb_const.mod
-      ${MODSH_BUILD_DIR}/h5lt.mod
-      ${MODSH_BUILD_DIR}/h5lt_const.mod
-      ${MODSH_BUILD_DIR}/h5im.mod
-  )
+  foreach (mod_file ${mod_export_files})
+    set (modsh_files ${modsh_files} ${MODSH_BUILD_DIR}/${mod_file})
+  endforeach ()
   install (
       FILES
           ${modsh_files}
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index e082f4c..209186b 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -17,15 +17,15 @@
 ##############################################################################
 
 set (test_hl_fortran_CLEANFILES
-          dsetf1.h5
-          dsetf2.h5
-          dsetf3.h5
-          dsetf4.h5
-          dsetf5.h5
-          f1img.h5
-          f1tab.h5
-          f2tab.h5
-          tstds.h5
+    dsetf1.h5
+    dsetf2.h5
+    dsetf3.h5
+    dsetf4.h5
+    dsetf5.h5
+    f1img.h5
+    f1tab.h5
+    f2tab.h5
+    tstds.h5
 )
 
 # Remove any output file left over from previous test run
@@ -34,7 +34,19 @@ add_test (
     COMMAND    ${CMAKE_COMMAND}
         -E remove ${test_hl_fortran_CLEANFILES}
 )
-set_tests_properties (HL_FORTRAN_test-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_FORTRAN_test)
+set_tests_properties (HL_FORTRAN_test-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_FORTRAN_test
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_FORTRAN_test-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${test_hl_fortran_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_test-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_FORTRAN_test
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
 
 macro (ADD_H5_FORTRAN_TEST file)
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -54,6 +66,7 @@ macro (ADD_H5_FORTRAN_TEST file)
   endif ()
   set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES
       FIXTURES_REQUIRED clear_HL_FORTRAN_test
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
 endmacro ()
 
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 2700188..fafa0ef 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -43,7 +43,7 @@ set (HL_PRIVATE_HEADERS
 if (BUILD_STATIC_LIBS)
   add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS} ${HL_PRIVATE_HEADERS})
   target_include_directories (${HDF5_HL_LIB_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
@@ -58,7 +58,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS} ${HL_PRIVATE_HEADERS})
   target_include_directories (${HDF5_HL_LIBSH_TARGET}
-      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
   target_compile_options(${HDF5_HL_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index c619fc6..cec2458 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -20,7 +20,7 @@ configure_file (${HDF5_HL_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ON
 macro (HL_ADD_EXE hl_name)
   add_executable (hl_${hl_name} ${hl_name}.c)
   target_compile_options(hl_${hl_name} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT BUILD_SHARED_LIBS)
     TARGET_C_PROPERTIES (hl_${hl_name} STATIC)
     target_link_libraries (hl_${hl_name} PRIVATE
@@ -58,7 +58,7 @@ HL_ADD_EXE (test_h5do_compat)
 # test_packet has two source files
 add_executable (hl_test_packet test_packet.c test_packet_vlen.c)
 target_compile_options(hl_test_packet PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-target_include_directories (hl_test_packet PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (hl_test_packet PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (hl_test_packet STATIC)
   target_link_libraries (hl_test_packet PRIVATE
@@ -90,7 +90,7 @@ endif ()
 if (HDF5_BUILD_GENERATORS AND BUILD_STATIC_LIBS)
   add_executable (hl_gen_test_ds gen_test_ds.c)
   target_compile_options(hl_gen_test_ds PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (hl_gen_test_ds PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (hl_gen_test_ds PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (hl_gen_test_ds STATIC)
   target_link_libraries (hl_gen_test_ds PRIVATE
       ${HDF5_HL_LIB_TARGET}
@@ -108,7 +108,7 @@ if (HDF5_BUILD_GENERATORS AND BUILD_STATIC_LIBS)
 
   add_executable (hl_gen_test_ld gen_test_ld.c)
   target_compile_options(hl_gen_test_ld PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (hl_gen_test_ld PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (hl_gen_test_ld PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (hl_gen_test_ld STATIC)
   target_link_libraries (hl_gen_test_ld PRIVATE
       ${HDF5_HL_LIB_TARGET}
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index cc4786e..9d3ff0c 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -81,7 +81,18 @@ add_test (
     NAME HL_test-clear-objects
     COMMAND    ${CMAKE_COMMAND} -E remove ${test_hl_CLEANFILES}
 )
-set_tests_properties (HL_test-clear-objects PROPERTIES FIXTURES_SETUP clear_test_hl)
+set_tests_properties (HL_test-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_test_hl
+    WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
+)
+add_test (
+    NAME HL_test-clean-objects
+    COMMAND    ${CMAKE_COMMAND} -E remove ${test_hl_CLEANFILES}
+)
+set_tests_properties (HL_test-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_test_hl
+    WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
+)
 
 # --------------------------------------------------------------------
 #  Macro used to add a unit test
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index fd9b6d9..a0bd744 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,6 +1,12 @@
 cmake_minimum_required (VERSION 3.12)
 project (HDF5_HL_TOOLS C)
 
-add_subdirectory (gif2h5)
+#-----------------------------------------------------------------------------
+#-- Option to build the High level GIF Tools
+#-----------------------------------------------------------------------------
+option (HDF5_BUILD_HL_GIF_TOOLS  "Build HDF5 HL GIF Tools" OFF)
+if (HDF5_BUILD_HL_GIF_TOOLS)
+  add_subdirectory (gif2h5)
+endif ()
 
 add_subdirectory (h5watch)
diff --git a/hl/tools/Makefile.am b/hl/tools/Makefile.am
index 6687f40..9f93f67 100644
--- a/hl/tools/Makefile.am
+++ b/hl/tools/Makefile.am
@@ -18,7 +18,13 @@
 
 include $(top_srcdir)/config/commence.am
 
+if BUILD_TOOLS_HL_GIF_CONDITIONAL
+  TOOLS_GIF_DIR = gif2h5
+else
+  TOOLS_GIF_DIR =
+endif
+
 # All subdirectories
-SUBDIRS=gif2h5 h5watch
+SUBDIRS=h5watch $(TOOLS_GIF_DIR)
 
 include $(top_srcdir)/config/conclude.am
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index a797c80..8f18b09 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -17,7 +17,7 @@ set (GIF2H5_SOURCES
 if (BUILD_STATIC_LIBS)
   add_executable (gif2h5 ${GIF2H5_SOURCES})
   target_compile_options(gif2h5 PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (gif2h5 PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (gif2h5 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (gif2h5 STATIC)
   target_link_libraries (gif2h5 PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (gif2h5 PROPERTIES FOLDER tools/hl)
@@ -30,7 +30,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_executable (gif2h5-shared ${GIF2H5_SOURCES})
   target_compile_options(gif2h5-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (gif2h5-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (gif2h5-shared PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (gif2h5-shared SHARED)
   target_link_libraries (gif2h5-shared PRIVATE ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${HDF5_TOOLS_LIBSH_TARGET})
   set_target_properties (gif2h5-shared PROPERTIES FOLDER tools/hl)
@@ -59,7 +59,7 @@ set (hdf2gif_SOURCES
 if (BUILD_STATIC_LIBS)
   add_executable (h52gif ${hdf2gif_SOURCES})
   target_compile_options(h52gif PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (h52gif PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h52gif PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h52gif STATIC)
   target_link_libraries (h52gif PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h52gif PROPERTIES FOLDER tools/hl)
@@ -72,7 +72,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_executable (h52gif-shared ${hdf2gif_SOURCES})
   target_compile_options(h52gif-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (h52gif-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h52gif-shared PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h52gif-shared SHARED)
   target_link_libraries (h52gif-shared PRIVATE ${HDF5_HL_LIBSH_TARGET} PRIVATE ${HDF5_LIBSH_TARGET} ${HDF5_TOOLS_LIBSH_TARGET})
   set_target_properties (h52gif-shared PROPERTIES FOLDER tools/hl)
@@ -101,7 +101,7 @@ if (BUILD_TESTING AND HDF5_TEST_SERIAL)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS AND BUILD_STATIC_LIBS)
       add_executable (hl_h52gifgentest ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/h52gifgentst.c)
-      target_include_directories (hl_h52gifgentest PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+      target_include_directories (hl_h52gifgentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
       TARGET_C_PROPERTIES (hl_h52gifgentest STATIC)
       target_link_libraries (hl_h52gifgentest PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
       set_target_properties (hl_h52gifgentest PROPERTIES FOLDER generator/tools/hl)
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake
index 36ea5f9..b2a8e27 100644
--- a/hl/tools/gif2h5/CMakeTests.cmake
+++ b/hl/tools/gif2h5/CMakeTests.cmake
@@ -28,16 +28,24 @@ HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "$
 add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list})
 
 # Remove any output file left over from previous test run
+set (HL_TOOLS_CLEANFILES
+    image1.gif
+    image1.h5
+    image.gif
+    image24.gif
+)
 add_test (
     NAME HL_TOOLS-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        image1.gif
-        image1.h5
-        image.gif
-        image24.gif
+        -E remove ${HL_TOOLS_CLEANFILES}
 )
 set_tests_properties (HL_TOOLS-clear-objects PROPERTIES FIXTURES_SETUP clear_tools_hl)
+add_test (
+    NAME HL_TOOLS-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_TOOLS_CLEANFILES}
+)
+set_tests_properties (HL_TOOLS-clean-objects PROPERTIES FIXTURES_CLEANUP clear_tools_hl)
 
 add_test (NAME HL_TOOLS_gif2h5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:gif2h5${tgt_file_ext}> testfiles/image1.gif image1.h5)
 set_tests_properties (HL_TOOLS_gif2h5 PROPERTIES
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index 6c667c7..9d07a1e 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -12,7 +12,7 @@ set (H5WATCH_SOURCES
 if (BUILD_STATIC_LIBS)
   add_executable (h5watch ${H5WATCH_SOURCES})
   target_compile_options(h5watch PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (h5watch PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5watch PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5watch STATIC)
   target_link_libraries (h5watch PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h5watch PROPERTIES FOLDER tools/hl)
@@ -21,7 +21,7 @@ endif ()
 if (BUILD_SHARED_LIBS)
   add_executable (h5watch-shared ${H5WATCH_SOURCES})
   target_compile_options(h5watch-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (h5watch-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5watch-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5watch-shared SHARED)
   target_link_libraries (h5watch-shared PRIVATE ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${HDF5_TOOLS_LIBSH_TARGET})
   set_target_properties (h5watch-shared PROPERTIES FOLDER tools/hl)
@@ -46,7 +46,7 @@ if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   )
   add_executable (extend_dset ${extend_dset_SOURCES})
   target_compile_options(extend_dset PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (extend_dset PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_HL_SRC_DIR}/src;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (extend_dset PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_HL_SRC_DIR}/src;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (BUILD_STATIC_LIBS)
     TARGET_C_PROPERTIES (extend_dset STATIC)
     target_link_libraries (extend_dset PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -65,7 +65,7 @@ if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
 
   add_executable (h5watchgentest ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/h5watchgentest.c)
   target_compile_options(h5watchgentest PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (h5watchgentest PRIVATE "${HDF5_HL_SRC_DIR}/src;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5watchgentest PRIVATE "${HDF5_HL_SRC_DIR}/src;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (BUILD_STATIC_LIBS)
     TARGET_C_PROPERTIES (h5watchgentest STATIC)
     target_link_libraries (h5watchgentest PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index 32b2b95..a7828b3 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -116,12 +116,6 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
   macro (ADD_H5_WATCH resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5WATCH-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.h5
-      )
-      set_tests_properties (H5WATCH-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      add_test (
           NAME H5WATCH-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@@ -134,7 +128,7 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
       set_tests_properties (H5WATCH-${resultfile} PROPERTIES
-          DEPENDS H5WATCH-${resultfile}-clear-objects
+          DEPENDS ${last_test}
           FIXTURES_REQUIRED gen_test_watch
       )
       set (last_test "H5WATCH-${resultfile}")
@@ -164,7 +158,12 @@ set_tests_properties (H5WATCH-clearall-objects PROPERTIES FIXTURES_REQUIRED swmr
 if (last_test)
   set_tests_properties (H5WATCH-clearall-objects PROPERTIES DEPENDS ${last_test})
 endif ()
-set (last_test "H5WATCH-clearall-objects")
+set (last_test "H5WATCH-cleanall-objects")
+add_test (
+  NAME H5WATCH-cleanall-objects
+  COMMAND ${CMAKE_COMMAND} -E remove WATCH.h5
+)
+set_tests_properties (H5WATCH-cleanall-objects PROPERTIES FIXTURES_CLEANUP swmr_vfd_check_compat)
 
 #################################################################################################
 #                                               #
@@ -189,7 +188,7 @@ set (last_test "H5WATCH-clearall-objects")
 add_test (NAME H5WATCH-h5watchgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5watchgentest>)
 set_tests_properties (H5WATCH-h5watchgentest PROPERTIES
     WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
-    DEPENDS "H5WATCH-clearall-objects"
+    DEPENDS H5WATCH-clearall-objects
 )
 set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_SETUP gen_test_watch)
 set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_REQUIRED swmr_vfd_check_compat)