Merge of HDFFV-10845, 10529 from develop

20 files changed, 604 insertions, 484 deletions

diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 8e64239..50e08e8 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -5,13 +5,22 @@ 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_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (ptExampleFL STATIC)
-target_link_libraries (ptExampleFL PRIVATE
-    ${HDF5_HL_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
+target_include_directories (ptExampleFL PRIVATE "${HDF5_SRC_DIR};${HDF5_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
+      ${HDF5_HL_CPP_LIB_TARGET}
+      ${HDF5_HL_LIB_TARGET}
+      ${HDF5_LIB_TARGET}
+  )
+else ()
+  TARGET_C_PROPERTIES (ptExampleFL SHARED)
+  target_link_libraries (ptExampleFL PRIVATE
+      ${HDF5_HL_CPP_LIBSH_TARGET}
+      ${HDF5_HL_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+endif ()
 set_target_properties (ptExampleFL PROPERTIES FOLDER examples/hl/cpp)
 
 if (BUILD_TESTING)
diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake
index 103ec2b..7bc614b 100644
--- a/hl/c++/examples/CMakeTests.cmake
+++ b/hl/c++/examples/CMakeTests.cmake
@@ -21,12 +21,14 @@ add_test (
     COMMAND    ${CMAKE_COMMAND}
         -E remove
             PTcppexampleFL.h5
+            ptExampleFL.txt
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME HL_CPP_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
+  add_test (NAME HL_CPP_ex_ptExampleFL COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:ptExampleFL>)
 else ()
   add_test (NAME HL_CPP_ex_ptExampleFL COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:ptExampleFL>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 77419c6..9964160 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -8,21 +8,23 @@ project (HDF5_HL_CPP_SRC CXX)
 set (HDF5_HL_CPP_SOURCES ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
 set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 
-add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES})
-target_include_directories(${HDF5_HL_CPP_LIB_TARGET}
-    PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
-    INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC)
-target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC 0)
-set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
-set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES})
+  target_include_directories (${HDF5_HL_CPP_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
+  set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
+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}
+  target_include_directories (${HDF5_HL_CPP_LIBSH_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
@@ -56,7 +58,9 @@ if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
     INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
   endif ()
-  INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
+  endif ()
 
   install (
       TARGETS
@@ -83,7 +87,9 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
 
 set (_PKG_CONFIG_LIBS_PRIVATE)
 
-set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+endif ()
 if (BUILD_SHARED_LIBS)
   set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
 endif ()
@@ -102,7 +108,7 @@ install (
     COMPONENT hlcpplibraries
 )
 
-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
   set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
   configure_file (
       ${HDF_RESOURCES_DIR}/libh5cc.in
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 68c049c..cfb24a8 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -2,15 +2,26 @@ cmake_minimum_required (VERSION 3.10)
 project (HDF5_HL_CPP_TEST CXX)
 
 add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
-target_include_directories(hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (hl_ptableTest STATIC)
-target_link_libraries (hl_ptableTest PRIVATE
-    ${HDF5_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-    ${HDF5_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_HL_CPP_LIB_TARGET}
-)
+target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_DIR};${HDF5_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
+      ${HDF5_LIB_TARGET}
+      ${HDF5_TEST_LIB_TARGET}
+      ${HDF5_CPP_LIB_TARGET}
+      ${HDF5_HL_LIB_TARGET}
+      ${HDF5_HL_CPP_LIB_TARGET}
+  )
+else ()
+  TARGET_C_PROPERTIES (hl_ptableTest SHARED)
+  target_link_libraries (hl_ptableTest PRIVATE
+      ${HDF5_LIBSH_TARGET}
+      ${HDF5_TEST_LIBSH_TARGET}
+      ${HDF5_CPP_LIBSH_TARGET}
+      ${HDF5_HL_LIBSH_TARGET}
+      ${HDF5_HL_CPP_LIBSH_TARGET}
+  )
+endif ()
 set_target_properties (hl_ptableTest PROPERTIES FOLDER test/hl/cpp)
 
 include (CMakeTests.cmake)
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 785abca..3d0f93a 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -16,10 +16,16 @@
 ##############################################################################
 ##############################################################################
 
+add_test (
+    NAME HL_CPP_ptableTest-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${example}.txt
+)
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME HL_CPP_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)
+  add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
 else ()
   add_test (NAME HL_CPP_ptableTest COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:hl_ptableTest>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -30,3 +36,4 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 97c6de5..86c1770 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -28,9 +28,14 @@ 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_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (hl_ex_${example} STATIC)
-  target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (hl_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_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})
+  else ()
+    TARGET_C_PROPERTIES (hl_ex_${example} SHARED)
+    target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  endif ()
   set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
 endforeach ()
 
diff --git a/hl/examples/CMakeTests.cmake b/hl/examples/CMakeTests.cmake
index c1fd6c2..d0f9018 100644
--- a/hl/examples/CMakeTests.cmake
+++ b/hl/examples/CMakeTests.cmake
@@ -26,41 +26,39 @@ foreach (h5_file ${HDF5_TEST_FILES})
 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
-  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
-  )
-  if (last_test)
-    set_tests_properties (HL_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "HL_ex-clear-objects")
+# Remove any output file left over from previous test run
+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
+)
+set_tests_properties (HL_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_ex)
 
 foreach (example ${examples})
   if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME HL_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
+    add_test (NAME HL_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ex_${example}>)
   else ()
     add_test (NAME HL_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
         -D "TEST_PROGRAM=$<TARGET_FILE:hl_ex_${example}>"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
@@ -72,7 +70,10 @@ foreach (example ${examples})
     )
   endif ()
   if (last_test)
-    set_tests_properties (HL_ex_${example} PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (HL_ex_${example} PROPERTIES
+        DEPENDS ${last_test}
+        FIXTURES_REQUIRED clear_HL_ex
+    )
   endif ()
   set (last_test "HL_ex_${example}")
 endforeach ()
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index 27971b2..e41b8fe 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -8,18 +8,10 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  target_include_directories (hl_f90_ex_${example}
-      PRIVATE
-          "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
-  )
   target_compile_options(hl_f90_ex_${example}
       PRIVATE
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
-  target_link_libraries (hl_f90_ex_${example}
-      PRIVATE
-          ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET}
-  )
 #  set_property(TARGET hl_f90_ex_${example} APPEND PROPERTY
 #      LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
 #  )
@@ -29,11 +21,35 @@ foreach (example ${examples})
   if(MSVC)
     set_property(TARGET hl_f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
   endif()
-  set_target_properties (hl_f90_ex_${example} PROPERTIES
-      LINKER_LANGUAGE Fortran
-      FOLDER examples/hl/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
-  )
+  if (NOT BUILD_SHARED_LIBS)
+    target_include_directories (hl_f90_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
+    )
+    target_link_libraries (hl_f90_ex_${example}
+        PRIVATE
+            ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET}
+    )
+    set_target_properties (hl_f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (hl_f90_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
+    )
+    target_link_libraries (hl_f90_ex_${example}
+        PRIVATE
+            ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}
+    )
+    set_target_properties (hl_f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif ()
 endforeach ()
 
 if (BUILD_TESTING)
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 91cb56b..b8f40d0 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -21,16 +21,17 @@ add_test (
     NAME HL_FORTRAN_f90_ex-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove
-        ex_ds1.h5
-        exlite.h5
+            ex_ds1.h5
+            exlite.h5
 )
-
+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)
-    add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
+    add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_ex_${example}>)
   else ()
     add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
         -D "TEST_PROGRAM=$<TARGET_FILE:hl_f90_ex_${example}>"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
@@ -41,5 +42,7 @@ foreach (example ${examples})
         -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
     )
   endif ()
-  set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES DEPENDS HL_FORTRAN_f90_ex-clear-objects)
+  set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES
+      FIXTURES_REQUIRED clear_HL_FORTRAN_f90_ex
+  )
 endforeach ()
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index e90253b..1bbc8b4 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -5,8 +5,10 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   file (MAKE_DIRECTORY "${HDF5_HL_F90_BINARY_DIR}/shared")
   set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
-file (MAKE_DIRECTORY "${HDF5_HL_F90_BINARY_DIR}/static")
-set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
+if (NOT ONLY_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_HL_F90_BINARY_DIR}/static")
+  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
+endif ()
 
 #-----------------------------------------------------------------------------
 # hl_f90CStub lib
@@ -22,24 +24,25 @@ set_source_files_properties (${HDF5_HL_F90_C_SOURCES} PROPERTIES LANGUAGE C)
 
 set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
 
-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_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
-    INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC)
-target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} STATIC 0)
-set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl/fortran
-    LINKER_LANGUAGE C
-)
-set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
-
+if (NOT ONLY_SHARED_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_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE C
+  )
+  set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
+endif ()
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   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}
+  target_include_directories (${HDF5_HL_F90_C_LIBSH_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
@@ -68,41 +71,42 @@ set (HDF5_HL_F90_F_SRCS
 )
 set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran)
 
-add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SRCS})
-target_include_directories (${HDF5_HL_F90_LIB_TARGET}
-    PRIVATE
-        "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
-    INTERFACE
-        "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-target_compile_definitions(${HDF5_HL_F90_LIB_TARGET}
-    PUBLIC
-        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS>
-    PRIVATE
-        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
-)
-target_link_libraries (${HDF5_HL_F90_LIB_TARGET}
-    PUBLIC
-        ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET}
-)
-#set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY
-#    LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
-#)
-#set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY
-#    LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
-#)
-if(MSVC)
-  set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
-endif()
-set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl/fortran
-    LINKER_LANGUAGE Fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
-)
-H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} STATIC 0)
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
-set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET})
-
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SRCS})
+  target_include_directories (${HDF5_HL_F90_LIB_TARGET}
+      PRIVATE
+          "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+      INTERFACE
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_definitions(${HDF5_HL_F90_LIB_TARGET}
+      PUBLIC
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS>
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_HL_F90_LIB_TARGET}
+      PUBLIC
+          ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET}
+  )
+#  set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY
+#      LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
+#  )
+#  set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY
+#      LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
+#  )
+  if(MSVC)
+    set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} STATIC 0)
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
+  set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET})
+endif ()
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SRCS})
   target_include_directories (${HDF5_HL_F90_LIBSH_TARGET}
@@ -151,22 +155,23 @@ endif ()
 #-----------------------------------------------------------------------------
 
 
-set (mod_files
-    ${MOD_BUILD_DIR}/h5ds.mod
-    ${MOD_BUILD_DIR}/h5tb.mod
-    ${MOD_BUILD_DIR}/h5lt.mod
-    ${MOD_BUILD_DIR}/h5im.mod
-)
-
-install (
-    FILES
-        ${mod_files}
-    DESTINATION
-        ${HDF5_INSTALL_INCLUDE_DIR}/static
-    COMPONENT
-        fortheaders
-)
+if (NOT ONLY_SHARED_LIBS)
+  set (mod_files
+      ${MOD_BUILD_DIR}/h5ds.mod
+      ${MOD_BUILD_DIR}/h5tb.mod
+      ${MOD_BUILD_DIR}/h5lt.mod
+      ${MOD_BUILD_DIR}/h5im.mod
+  )
 
+  install (
+      FILES
+          ${mod_files}
+      DESTINATION
+          ${HDF5_INSTALL_INCLUDE_DIR}/static
+      COMPONENT
+          fortheaders
+  )
+endif ()
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   set (modsh_files
       ${MODSH_BUILD_DIR}/h5ds.mod
@@ -192,8 +197,10 @@ if (HDF5_EXPORTED_TARGETS)
     INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
     #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
   endif ()
-  INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
-  #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+  endif ()
 
   install (
       TARGETS
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index c41ab2e..b186db2 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -13,18 +13,10 @@ set (H5_TESTS
 
 macro (ADD_H5_FORTRAN_EXE file)
   add_executable (hl_f90_${file} ${file}.f90)
-  target_include_directories (hl_f90_${file}
-      PRIVATE
-          "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
-  )
   target_compile_options(hl_f90_${file}
       PRIVATE
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
-  target_link_libraries (hl_f90_${file}
-      PRIVATE
-          ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET}
-  )
 #  set_property(TARGET hl_f90_${file} APPEND PROPERTY
 #      LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
 #  )
@@ -34,35 +26,30 @@ macro (ADD_H5_FORTRAN_EXE file)
   if(MSVC)
     set_property(TARGET hl_f90_${file} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
   endif()
-  set_target_properties (hl_f90_${file} PROPERTIES
-      LINKER_LANGUAGE Fortran
-      FOLDER test/hl/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
-  )
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-    add_executable (hl_f90_${file}-shared ${file}.f90)
-    target_include_directories (hl_f90_${file}-shared
+  if (NOT BUILD_SHARED_LIBS)
+    target_include_directories (hl_f90_${file}
         PRIVATE
-            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
     )
-    target_compile_options(hl_f90_${file}-shared
+    target_link_libraries (hl_f90_${file}
         PRIVATE
-            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+            ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET}
+    )
+    set_target_properties (hl_f90_${file} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  elseif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+    target_include_directories (hl_f90_${file}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src"
     )
-    target_link_libraries (hl_f90_${file}-shared
+    target_link_libraries (hl_f90_${file}
         PRIVATE
             ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET}
     )
-#    set_property(TARGET hl_f90_${file}-shared APPEND PROPERTY
-#        LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
-#    )
-#    set_property(TARGET hl_f90_${file}-shared APPEND PROPERTY
-#        LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
-#    )
-    if(MSVC)
-      set_property(TARGET hl_f90_${file}-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
-    endif()
-    set_target_properties (hl_f90_${file}-shared PROPERTIES
+    set_target_properties (hl_f90_${file} PROPERTIES
         LINKER_LANGUAGE Fortran
         FOLDER test/hl/fortran
         Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
@@ -70,8 +57,8 @@ macro (ADD_H5_FORTRAN_EXE file)
   endif ()
 endmacro ()
 
-foreach (test ${H5_TESTS})
-  ADD_H5_FORTRAN_EXE(${test})
+foreach (h5_test ${H5_TESTS})
+  ADD_H5_FORTRAN_EXE(${h5_test})
 endforeach ()
 
 include (CMakeTests.cmake)
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 2b66556..0760b92 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -16,11 +16,32 @@
 ##############################################################################
 ##############################################################################
 
+set (test_hl_fortran_CLEANFILES
+          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
+add_test (
+    NAME HL_FORTRAN_test-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${test_hl_fortran_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_test-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_FORTRAN_test)
+
 macro (ADD_H5_FORTRAN_TEST file)
   if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME HL_FORTRAN_f90_${file} COMMAND $<TARGET_FILE:hl_f90_${file}>)
+    add_test (NAME HL_FORTRAN_f90_${file} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_${file}>)
   else ()
     add_test (NAME HL_FORTRAN_f90_${file} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
         -D "TEST_PROGRAM=$<TARGET_FILE:hl_f90_${file}>"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
@@ -31,59 +52,10 @@ macro (ADD_H5_FORTRAN_TEST file)
         -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
     )
   endif ()
-  set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME HL_FORTRAN_f90_${file}-shared COMMAND $<TARGET_FILE:hl_f90_${file}-shared>)
-    else ()
-      add_test (NAME HL_FORTRAN_f90_${file}-shared COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:hl_f90_${file}-shared>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=hl_f90_${file}-shared.txt"
-          #-D "TEST_REFERENCE=hl_f90_${file}-shared.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    set_tests_properties (HL_FORTRAN_f90_${file}-shared PROPERTIES DEPENDS HL_FORTRAN_test-shared-clear-objects)
-  endif ()
-endmacro ()
-
-# Remove any output file left over from previous test run
-add_test (
-    NAME HL_FORTRAN_test-clear-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        dsetf1.h5
-        dsetf2.h5
-        dsetf3.h5
-        dsetf4.h5
-        dsetf5.h5
-        f1img.h5
-        f1tab.h5
-        tstds.h5
-)
-
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  add_test (
-      NAME HL_FORTRAN_test-shared-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          dsetf1.h5
-          dsetf2.h5
-          dsetf3.h5
-          dsetf4.h5
-          dsetf5.h5
-          f1img.h5
-          f1tab.h5
-          tstds.h5
+  set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES
+      FIXTURES_REQUIRED clear_HL_FORTRAN_test
   )
-  set_tests_properties (HL_FORTRAN_test-shared-clear-objects
-      PROPERTIES DEPENDS "HL_FORTRAN_f90_tsttable;HL_FORTRAN_f90_tstimage;HL_FORTRAN_f90_tstlite;HL_FORTRAN_f90_tstds"
-  )
-endif ()
+endmacro ()
 
 foreach (h5_test ${H5_TESTS})
   ADD_H5_FORTRAN_TEST(${h5_test})
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index a1847a4..cab8e7a 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -26,21 +26,23 @@ set (HL_HEADERS
     ${HDF5_HL_SRC_SOURCE_DIR}/hdf5_hl.h
 )
 
-add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS})
-target_include_directories(${HDF5_HL_LIB_TARGET}
-    PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
-    INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC)
-target_link_libraries (${HDF5_HL_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
-H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC 0)
-set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
-set (install_targets ${HDF5_HL_LIB_TARGET})
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS})
+  target_include_directories (${HDF5_HL_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+  H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
+  set (install_targets ${HDF5_HL_LIB_TARGET})
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS})
-  target_include_directories(${HDF5_HL_LIBSH_TARGET}
+  target_include_directories (${HDF5_HL_LIBSH_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
   )
@@ -74,7 +76,9 @@ if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
     INSTALL_TARGET_PDB (${HDF5_HL_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
   endif ()
-  INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hllibraries)
+  endif ()
 
   install (
       TARGETS
@@ -101,7 +105,9 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
 
 set (_PKG_CONFIG_LIBS_PRIVATE)
 
-set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}")
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}")
+endif ()
 if (BUILD_SHARED_LIBS)
   set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}")
 endif ()
@@ -120,7 +126,7 @@ install (
     COMPONENT hllibraries
 )
 
-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
   set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
   configure_file (
       ${HDF_RESOURCES_DIR}/libh5cc.in
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 327c50b..f380b4e 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -17,54 +17,83 @@ configure_file (${HDF5_HL_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ON
 # --------------------------------------------------------------------
 #  Macro used to add a unit test
 # --------------------------------------------------------------------
-MACRO (HL_ADD_EXE hl_name)
+macro (HL_ADD_EXE hl_name)
   add_executable (hl_${hl_name} ${hl_name}.c)
-  target_include_directories(hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (hl_${hl_name} STATIC)
-  target_link_libraries (hl_${hl_name} PRIVATE
-      ${HDF5_HL_LIB_TARGET}
-      ${HDF5_TEST_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-  )
+  target_include_directories (hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_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
+        ${HDF5_HL_LIB_TARGET}
+        ${HDF5_TEST_LIB_TARGET}
+        ${HDF5_LIB_TARGET}
+    )
+  else ()
+    TARGET_C_PROPERTIES (hl_${hl_name} SHARED)
+    target_link_libraries (hl_${hl_name} PRIVATE
+        ${HDF5_HL_LIBSH_TARGET}
+        ${HDF5_TEST_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+    )
+  endif ()
   set_target_properties (hl_${hl_name} PROPERTIES FOLDER test/hl)
-ENDMACRO ()
+endmacro ()
 
-MACRO (HL_ADD_SHEXE hl_name)
+macro (HL_ADD_ZEXE hl_name)
   add_executable (hl_${hl_name} ${hl_name}.c)
-  target_include_directories(hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (hl_${hl_name} SHARED)
-  target_link_libraries (hl_${hl_name} PRIVATE
-      ${HDF5_HL_LIBSH_TARGET}
-      ${HDF5_TEST_LIBSH_TARGET}
-      ${HDF5_LIBSH_TARGET}
-  )
+  target_include_directories (hl_${hl_name} PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_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
+        ${HDF5_HL_LIB_TARGET}
+        ${HDF5_TEST_LIB_TARGET}
+        ${HDF5_LIB_TARGET}
+        ${LINK_COMP_LIBS}
+    )
+  else ()
+    TARGET_C_PROPERTIES (hl_${hl_name} SHARED)
+    target_link_libraries (hl_${hl_name} PRIVATE
+        ${HDF5_HL_LIBSH_TARGET}
+        ${HDF5_TEST_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+        ${LINK_COMP_LIBS}
+    )
+  endif ()
   set_target_properties (hl_${hl_name} PROPERTIES FOLDER test/hl)
-ENDMACRO ()
+endmacro ()
 
 HL_ADD_EXE (test_ds)
-HL_ADD_EXE (test_dset_opt)
+HL_ADD_ZEXE (test_dset_opt)
 HL_ADD_EXE (test_image)
 HL_ADD_EXE (test_lite)
 HL_ADD_EXE (test_table)
 
 # test_packet has two source files
 add_executable (hl_test_packet test_packet.c test_packet_vlen.c)
-target_include_directories(hl_test_packet PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (hl_test_packet STATIC)
-target_link_libraries (hl_test_packet PRIVATE
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
+target_include_directories (hl_test_packet PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_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
+      ${HDF5_HL_LIB_TARGET}
+      ${HDF5_TEST_LIB_TARGET}
+      ${HDF5_LIB_TARGET}
+  )
+else ()
+  TARGET_C_PROPERTIES (hl_test_packet SHARED)
+  target_link_libraries (hl_test_packet PRIVATE
+      ${HDF5_HL_LIBSH_TARGET}
+      ${HDF5_TEST_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+endif ()
 set_target_properties (hl_test_packet PROPERTIES FOLDER test/hl)
 
 # --------------------------------------------------------------------
 # This executable is used to generate test files for the test_ds test.
 # It should only be run during development when new test files are needed
 # --------------------------------------------------------------------
-if (HDF5_BUILD_GENERATORS)
+if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   add_executable (hl_gen_test_ds gen_test_ds.c)
-  target_include_directories(hl_gen_test_ds PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (hl_gen_test_ds PRIVATE "${HDF5_SRC_DIR};${HDF5_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}
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index 6648edd..c4c8023 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -42,14 +42,48 @@ foreach (h5_file ${HL_REFERENCE_TEST_FILES})
 endforeach ()
 add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list})
 
+# Remove any output file left over from previous test run
+set (test_hl_CLEANFILES
+    combine_tables1.h5
+    combine_tables2.h5
+    test_detach.h5
+    test_ds1.h5
+    test_ds2.h5
+    test_ds3.h5
+    test_ds4.h5
+    test_ds5.h5
+    test_ds6.h5
+    test_ds7.h5
+    test_ds8.h5
+    test_ds9.h5
+    test_ds10.h5
+    test_dectris.h5
+    test_image1.h5
+    test_image2.h5
+    test_image3.h5
+    test_lite1.h5
+    test_lite2.h5
+    test_lite3.h5
+    test_lite4.h5
+    test_packet_compress.h5
+    test_packet_table.h5
+    test_table.h5
+)
+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)
+
 # --------------------------------------------------------------------
 #  Macro used to add a unit test
 # --------------------------------------------------------------------
 macro (HL_ADD_TEST hl_name)
   if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME HL_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
+    add_test (NAME HL_${hl_name} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_${hl_name}>)
   else ()
     add_test (NAME HL_${hl_name} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
         -D "TEST_PROGRAM=$<TARGET_FILE:hl_${hl_name}>"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
@@ -60,49 +94,13 @@ macro (HL_ADD_TEST hl_name)
         -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
     )
   endif ()
-  if (last_test)
-    set_tests_properties (HL_${hl_name} PROPERTIES DEPENDS ${last_test}
+  set_tests_properties (HL_${hl_name} PROPERTIES
+      FIXTURES_REQUIRED clear_test_hl
       ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}"
       WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
-    )
-  endif ()
+  )
 endmacro ()
 
-# Remove any output file left over from previous test run
-add_test (
-    NAME HL_test-clear-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        combine_tables1.h5
-        combine_tables2.h5
-        test_detach.h5
-        test_ds1.h5
-        test_ds2.h5
-        test_ds3.h5
-        test_ds4.h5
-        test_ds5.h5
-        test_ds6.h5
-        test_ds7.h5
-        test_ds8.h5
-        test_ds9.h5
-        test_ds10.h5
-        test_dectris.h5
-        test_image1.h5
-        test_image2.h5
-        test_image3.h5
-        test_lite1.h5
-        test_lite2.h5
-        test_lite3.h5
-        test_lite4.h5
-        test_packet_compress.h5
-        test_packet_table.h5
-        test_table.h5
-)
-if (last_test)
-  set_tests_properties (HL_test-clear-objects PROPERTIES DEPENDS ${last_test})
-endif ()
-set (last_test "HL_test-clear-objects")
-
 HL_add_test (test_ds)
 HL_add_test (test_dset_opt)
 HL_add_test (test_image)
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 5560f03..f2d4b8f 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -186,11 +186,11 @@ int main(void)
 
 
     if(nerrors) goto error;
-    printf("All dimension scales tests passed.\n");
+    HDprintf("All dimension scales tests passed.\n");
     return 0;
 
 error:
-    printf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
@@ -1103,7 +1103,7 @@ herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *sc
     if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
         if(H5DSis_attached(did, dsid, idx) == 1) {
             if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) {
-	        name_out = (char*)HDmalloc((name_len+1) * sizeof (char));
+            name_out = (char*)HDmalloc((name_len+1) * sizeof (char));
                 if(name_out != NULL) {
                     if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) >= 0) {
                         if(HDstrcmp(scalename,name_out)==0) {
@@ -1131,7 +1131,7 @@ static int test_detachscales(void)
     int     rank3 = 3;
     hsize_t dims[] = {1,2,3}; /*some bogus numbers, not important for the test*/
     int     *buf = NULL;
-    char    dname[10];
+    char    dname[16];
     int     i;
 
     /* This tests creates two three dimensional datasets; then it creates
@@ -1149,7 +1149,7 @@ static int test_detachscales(void)
         sprintf(dname,"D%d", i);
         if(H5LTmake_dataset_int(fid, dname, rank3, dims, buf) < 0)
             goto out;
-    } 
+    }
     /* create datasets and make them dim. scales */
 
     for (i=0; i < 4; i++) {
@@ -1157,11 +1157,11 @@ static int test_detachscales(void)
         if(H5LTmake_dataset_int(fid, dname, rank1, dims, buf) < 0)
             goto out;
     }
-    /* attach scales to the first dataset; first dimension will have 
+    /* attach scales to the first dataset; first dimension will have
        two scales attached  */
     if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
         for (i=0; i<4; i++) {
-           sprintf(dname, "DS%d", i);
+           HDsprintf(dname, "DS%d", i);
            if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
                goto out;
            if(H5DSattach_scale(did, dsid, (unsigned int) i%3) < 0)
@@ -1178,7 +1178,7 @@ static int test_detachscales(void)
    /* attach scales to the second dataset */
     if((did = H5Dopen2(fid, "D1", H5P_DEFAULT)) >= 0) {
         for (i=0; i<3; i++) {
-           sprintf(dname, "DS%d", i);
+           HDsprintf(dname, "DS%d", i);
            if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
                goto out;
            if(H5DSattach_scale(did, dsid, (unsigned int) i) < 0)
@@ -1199,20 +1199,20 @@ static int test_detachscales(void)
                goto out;
 
     for (i=0; i<2; i++) {
-        sprintf(dname, "D%d", i);
+        HDsprintf(dname, "D%d", i);
         if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
             goto out;
         if(H5DSdetach_scale(did, dsid, (unsigned int)0) < 0)
             goto out;
         if(H5Dclose(did) < 0)
             goto out;
-    } 
+    }
     /* Check that attribute "REFERENCE_LIST" doesn't exist anymore */
     if(H5Aexists(dsid, REFERENCE_LIST)!= 0)
         goto out;
     if(H5Dclose(dsid) < 0)
         goto out;
-    /* Check that DS3 is the only dim. scale attached to the first 
+    /* Check that DS3 is the only dim. scale attached to the first
        dimension of D0 */
     if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) < 0)
         goto out;
@@ -1225,11 +1225,11 @@ static int test_detachscales(void)
     if(H5Dclose(dsid) < 0)
         goto out;
 
-    /* Detach the rest of the scales DS3, DS1, DS2 from D0 and make 
+    /* Detach the rest of the scales DS3, DS1, DS2 from D0 and make
        sure that attribute "DIMENSION_LIST" doesn't exist anymore */
     if((did = H5Dopen2(fid, "D0", H5P_DEFAULT)) >= 0) {
         for (i=1; i<4; i++) {
-           sprintf(dname, "DS%d", i);
+           HDsprintf(dname, "DS%d", i);
            if((dsid = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
                goto out;
            if(H5DSdetach_scale(did, dsid, (unsigned int) i%3) < 0)
@@ -1246,7 +1246,7 @@ static int test_detachscales(void)
     else
         goto out;
 
-    
+
     PASSED();
 
     H5Fclose(fid);
@@ -2874,10 +2874,10 @@ static int test_simple(void)
     if((sid = H5Screate_simple(rank,dims,NULL)) < 0)
         goto out;
     for(i = 0; i < 5; i++) {
-        sprintf(dname,"dset_%d",i);
+        HDsprintf(dname,"dset_%d",i);
         if((did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        sprintf(sname,"ds_%d",i);
+        HDsprintf(sname,"ds_%d",i);
         if((dsid = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if(H5DSset_scale(dsid,"scale") < 0)
@@ -2894,11 +2894,11 @@ static int test_simple(void)
     */
 
     for(i = 0; i < 5; i++) {
-        sprintf(dname, "dset_%d", i);
+        HDsprintf(dname, "dset_%d", i);
         if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
         for(j = 0; j < 5; j++) {
-            sprintf(sname, "ds_%d", j);
+            HDsprintf(sname, "ds_%d", j);
             if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
                 goto out;
             if(H5DSattach_scale(did, dsid, DIM0) < 0)
@@ -2916,7 +2916,7 @@ static int test_simple(void)
     */
 
     for(i = 0; i < 5; i++) {
-        sprintf(dname, "dset_%d", i);
+        HDsprintf(dname, "dset_%d", i);
         if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
         for(j = 0; j < 5; j++) {
@@ -2939,7 +2939,7 @@ static int test_simple(void)
     */
 
     for(i=0; i<5; i++) {
-        sprintf(dname,"dset_%d",i);
+        HDsprintf(dname,"dset_%d",i);
         if((did = H5Dopen2(gid,dname, H5P_DEFAULT)) < 0)
             goto out;
         for(j=0; j<5; j++) {
@@ -3081,7 +3081,7 @@ static int test_simple(void)
 
 
     /*-------------------------------------------------------------------------
-    * get the label using a static buffer smaller than the string lenght
+    * get the label using a static buffer smaller than the string length
     *-------------------------------------------------------------------------
     */
 
@@ -3119,7 +3119,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    /* get the lenght of the scale name (pass NULL in name) */
+    /* get the length of the scale name (pass NULL in name) */
     if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) < 0)
         goto out;
 
@@ -3152,7 +3152,7 @@ static int test_simple(void)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * get the scale name using a static buffer smaller than the string lenght
+    * get the scale name using a static buffer smaller than the string length
     *-------------------------------------------------------------------------
     */
 
@@ -3542,7 +3542,7 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
 
         for(i=0; i<nelmts; i++) {
             if(buf[i] != data[i]) {
-                printf("read and write buffers differ\n");
+                HDprintf("read and write buffers differ\n");
                 goto out;
             }
         }
@@ -4871,8 +4871,7 @@ static int read_data( const char* fname,
 
     HDstrcpy(data_file, "");
     /* compose the name of the file to open, using the srcdir, if appropriate */
-    if(srcdir)
-    {
+    if(srcdir) {
         HDstrcpy(data_file, srcdir);
         HDstrcat(data_file, "/");
     }
@@ -4894,7 +4893,7 @@ static int read_data( const char* fname,
 
     *buf = (float*) HDmalloc (nelms * sizeof( float ));
 
-    if ( *buf == NULL ) {
+    if (*buf == NULL) {
         printf( "memory allocation failed\n" );
         HDfclose(f);
         return -1;
@@ -4924,7 +4923,7 @@ static int test_errors2(void)
     hsize_t dimd[2]  = {3,3};                 /* size of data dataset */
     hsize_t dims[1]  = {3};                   /* size of scale dataset */
     char    lbuf[255];                        /* label buffer */
-    ssize_t label_len;                        /* label lenght */
+    ssize_t label_len;                        /* label length */
     int     scale_idx;                        /* scale index */
     int     nscales;                          /* number of scales in DIM */
     int     count;                            /* visitor data */
@@ -5013,7 +5012,7 @@ static int test_errors2(void)
         goto out;
     if ((label_len=H5DSget_label(did,0,NULL,0)) < 0)
         goto out;
-    if ( label_len != strlen("label") )
+    if (label_len != HDstrlen("label"))
         goto out;
     if (H5DSget_label(did,0,lbuf,sizeof(lbuf)) < 0)
         goto out;
@@ -5124,128 +5123,128 @@ static int test_attach_detach(void)
     TESTING2("permutations of attaching and detaching");
 
     if((fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-      goto out;
+        goto out;
 
     if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
-      goto out;
+        goto out;
 
     /* Create dimension scale. */
 
     if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-      goto out;
-    
-    if((sid = H5Screate_simple(1, dims, dims)) < 0) 
-      goto out;
+        goto out;
+
+    if((sid = H5Screate_simple(1, dims, dims)) < 0)
+        goto out;
 
     if((dsid = H5Dcreate2(gid, DS_3_NAME, H5T_IEEE_F32BE, sid,
-         H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
-      goto out;
+            H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0) 
-      goto out;
-    if(H5Pclose(dcpl_id) < 0) 
-      goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl_id) < 0)
+        goto out;
 
-    if(H5DSset_scale(dsid, DS_3_NAME) < 0) 
-      goto out;
+    if(H5DSset_scale(dsid, DS_3_NAME) < 0)
+        goto out;
 
     /* Create a variable that uses this dimension scale. */
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0) 
-      goto out;
+    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
     if((var1_id = H5Dcreate2(gid, DS_31_NAME, H5T_NATIVE_FLOAT, sid,
-            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
-      goto out;
+            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0) 
-      goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Create another variable that uses this dimension scale. */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
-      goto out;
+    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
 
-    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) 
-      goto out;
+    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
+        goto out;
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0) 
-      goto out;
+    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
     if((var2_id = H5Dcreate2(gid, DS_32_NAME, H5T_NATIVE_FLOAT, sid,
-           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0) 
-      goto out;
+           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Pclose(dcpl_id) < 0) 
-      goto out;
+    if(H5Pclose(dcpl_id) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0) 
-      goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
 
     /* Create 3rd variable that uses this dimension scale. */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
-      goto out;
+    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
 
-    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) 
-      goto out;
+    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0)
+        goto out;
 
-    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0) 
-      goto out;
+    if((sid = H5Screate_simple(DIM1, dims, dims)) < 0)
+        goto out;
 
     if((var3_id = H5Dcreate2(gid, DS_33_NAME, H5T_NATIVE_FLOAT, sid,
-           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0) 
-      goto out;
+           H5P_DEFAULT, H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        goto out;
 
-    if(H5Pclose(dcpl_id) < 0) 
-      goto out;
+    if(H5Pclose(dcpl_id) < 0)
+        goto out;
+
+    if(H5Sclose(sid) < 0)
+        goto out;
 
-    if(H5Sclose(sid) < 0) 
-      goto out;
-    
     /* Attached var2 scale */
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Detach the var2 scale */
-    if(H5DSdetach_scale(var2_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
     if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
 
     /* Detach the var1 scale */
-    if(H5DSdetach_scale(var1_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
     /* Check if in correct state of detached and attached */
     if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
 
     /* Attach the DS again and remove them in the opposite order */
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
     /* Detach the var1 scale */
     if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+        goto out;
 
     /* Check if in correct state of detached and attached */
 
     if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+        goto out;
 
     /* Detach the var2 scale */
     if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
@@ -5253,78 +5252,78 @@ static int test_attach_detach(void)
 
     /* Check if in correct state of detached and attached */
     if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
 
     /***************************************************
      * Attach Three DS and remove the middle one first
      *****************************************************/
 
-    if(H5DSattach_scale(var1_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var1_id, dsid, 0) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var2_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var2_id, dsid, 0) < 0)
+        goto out;
 
-    if(H5DSattach_scale(var3_id, dsid, 0) < 0) 
-      goto out;
+    if(H5DSattach_scale(var3_id, dsid, 0) < 0)
+        goto out;
 
 
     /* Detach the var2 scale */
     if(H5DSdetach_scale(var2_id, dsid, 0) < 0)
-      goto out;
+        goto out;
 
     /* Check if in correct state of detached and attached */
 
     if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var3_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+        goto out;
 
     /* Detach the var3 scale */
     if(H5DSdetach_scale(var3_id, dsid, 0) < 0)
-      goto out;
+        goto out;
 
     /* Check if in correct state of detached and attached */
     if(H5DSis_attached(var1_id, dsid, 0) == 0) /* should still be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
 
     /* Detach the var1 scale */
     if(H5DSdetach_scale(var1_id, dsid, 0) < 0)
-      goto out;
+        goto out;
 
     /* Check if in correct state of detached and attached */
     if(H5DSis_attached(var1_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var2_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
     if(H5DSis_attached(var3_id, dsid, 0) != 0) /* should not be attached */
-      goto out;
+        goto out;
 
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
 
-    if(H5Dclose(var1_id) < 0) 
-      goto out;
-    if(H5Dclose(var2_id) < 0) 
-      goto out;
-    if(H5Dclose(var3_id) < 0) 
-      goto out;
-    if(H5Dclose(dsid) < 0) 
-      goto out;
-    if(H5Gclose(gid) < 0) 
-      goto out;
+    if(H5Dclose(var1_id) < 0)
+        goto out;
+    if(H5Dclose(var2_id) < 0)
+        goto out;
+    if(H5Dclose(var3_id) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
     if(H5Fclose(fid) < 0)
-      goto out;
+        goto out;
 
     PASSED();
 
@@ -5334,9 +5333,9 @@ static int test_attach_detach(void)
 out:
     H5E_BEGIN_TRY
     {
-  H5Dclose(var1_id);
-  H5Dclose(var2_id);
-  H5Dclose(var3_id);
+        H5Dclose(var1_id);
+        H5Dclose(var2_id);
+        H5Dclose(var3_id);
         H5Dclose(dsid);
         H5Gclose(gid);
         H5Fclose(fid);
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index a27ab18..3cd913f 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -14,24 +14,58 @@ set (GIF2H5_SOURCES
 )
 
 #-- Add gif2hdf5 program
-add_executable (gif2h5 ${GIF2H5_SOURCES})
-target_include_directories(gif2h5 PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};gif2h5")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (gif2h5 ${GIF2H5_SOURCES})
+  target_include_directories (gif2h5 PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};gif2h5")
+  set (H5_DEP_EXECUTABLES
+      gif2h5
+  )
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_executable (gif2h5-shared ${GIF2H5_SOURCES})
+  target_include_directories (gif2h5-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};gif2h5-shared")
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
+      gif2h5-shared
+  )
+endif ()
 
 #-- Add h52gif program
 set (hdf2gif_SOURCES
     ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/hdf2gif.c
     ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/hdfgifwr.c
 )
-add_executable (h52gif ${hdf2gif_SOURCES})
-target_include_directories(h52gif PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h52gif")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h52gif ${hdf2gif_SOURCES})
+  target_include_directories (h52gif PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h52gif")
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
+      h52gif
+  )
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_executable (h52gif-shared ${hdf2gif_SOURCES})
+  target_include_directories (h52gif-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h52gif-shared")
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
+      h52gif-shared
+  )
+endif ()
 
 if (BUILD_TESTING)
   # --------------------------------------------------------------------
@@ -39,14 +73,14 @@ if (BUILD_TESTING)
   #  used in the CMake Build system as we rely on the test files that are
   #  shipped with HDF5 source archives
   # --------------------------------------------------------------------
-  if (HDF5_BUILD_GENERATORS)
+  if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
       add_executable (hl_h52gifgentest ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/h52gifgentst.c)
-      target_include_directories(hl_h52gifgentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+      target_include_directories (hl_h52gifgentest PRIVATE "${HDF5_SRC_DIR};${HDF5_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)
 
-#      add_test (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>)
+#      add_test (NAME hl_h52gifgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_h52gifgentest>)
   endif ()
 
   include (CMakeTests.cmake)
@@ -58,8 +92,7 @@ endif ()
 if (HDF5_EXPORTED_TARGETS)
   install (
       TARGETS
-          gif2h5
-          h52gif
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hltoolsapplications
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake
index 61c004e..8537d7c 100644
--- a/hl/tools/gif2h5/CMakeTests.cmake
+++ b/hl/tools/gif2h5/CMakeTests.cmake
@@ -27,6 +27,12 @@ HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "$
 HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
 add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list})
 
+if (NOT BUILD_SHARED_LIBS)
+  set (tgt_ext "")
+else ()
+  set (tgt_ext "-shared")
+endif ()
+
 # Remove any output file left over from previous test run
 add_test (
     NAME HL_TOOLS-clear-objects
@@ -37,20 +43,32 @@ add_test (
         image.gif
         image24.gif
 )
+set_tests_properties (HL_TOOLS-clear-objects PROPERTIES FIXTURES_SETUP clear_tools_hl)
 
-add_test (NAME HL_TOOLS_gif2h5 COMMAND $<TARGET_FILE:gif2h5> testfiles/image1.gif image1.h5)
-set_tests_properties (HL_TOOLS_gif2h5 PROPERTIES DEPENDS HL_TOOLS-clear-objects)
+add_test (NAME HL_TOOLS_gif2h5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:gif2h5${tgt_ext}> testfiles/image1.gif image1.h5)
+set_tests_properties (HL_TOOLS_gif2h5 PROPERTIES
+    FIXTURES_REQUIRED clear_tools_hl
+)
 
-add_test (NAME HL_TOOLS_h52gif COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image1.gif -i image)
-set_tests_properties (HL_TOOLS_h52gif PROPERTIES DEPENDS HL_TOOLS-clear-objects)
+add_test (NAME HL_TOOLS_h52gif COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image1.gif -i image)
+set_tests_properties (HL_TOOLS_h52gif PROPERTIES
+    FIXTURES_REQUIRED clear_tools_hl
+)
 
-add_test (NAME HL_TOOLS_h52gif_none COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i nosuch_image)
-set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES WILL_FAIL "true")
-set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES DEPENDS HL_TOOLS-clear-objects)
+add_test (NAME HL_TOOLS_h52gif_none COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image.gif -i nosuch_image)
+set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES
+    WILL_FAIL "true"
+    FIXTURES_REQUIRED clear_tools_hl
+)
 
-#add_test (NAME HL_TOOLS_h52gifpal COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i palette)
-#set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES WILL_FAIL "true")
+#add_test (NAME HL_TOOLS_h52gifpal COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image.gif -i palette)
+#set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES
+#    WILL_FAIL "true"
+#    FIXTURES_REQUIRED clear_tools_hl
+#)
 
-add_test (NAME HL_TOOLS_h52gif24bits COMMAND $<TARGET_FILE:h52gif> testfiles/ex_image2.h5 image24.gif -i image24bitpixel)
-set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES WILL_FAIL "true")
-set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES DEPENDS HL_TOOLS-clear-objects)
+add_test (NAME HL_TOOLS_h52gif24bits COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/ex_image2.h5 image24.gif -i image24bitpixel)
+set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES
+    WILL_FAIL "true"
+    FIXTURES_REQUIRED clear_tools_hl
+)
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index 40b5583..11c9536 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -218,7 +218,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                         PlainTextCount++;
 
                         if (PlainTextCount > PlainTextArray)
-			  PlainTextArray = (BYTE)((PlainTextArray << 1) + 1);
+                            PlainTextArray = (BYTE)((PlainTextArray << 1) + 1);
 
                         if (!(gifPlainText = (GIFPLAINTEXT **)realloc(gifPlainText , sizeof(GIFPLAINTEXT *) * PlainTextArray))) {
                             printf("Out of memory!");
@@ -240,7 +240,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                         CommentCount++;
 
                         if (CommentCount > CommentArray)
-			  CommentArray = (BYTE)((CommentArray << 1) + 1);
+                            CommentArray = (BYTE)((CommentArray << 1) + 1);
 
                         if (!(gifComment = (GIFCOMMENT **)realloc(gifComment , sizeof(GIFCOMMENT *) * CommentArray))) {
                             printf("Out of memory!");
@@ -295,7 +295,8 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                             fprintf(stderr,
                                     "Error reading Graphic Control Extension information\n");
 
-                        if (!*MemGif++ == 0)
+                        (*MemGif)++;
+                        if ((!*MemGif) == 0)
                             fprintf(stderr,
                                     "Error reading Graphic Control Extension\n");
 
@@ -305,7 +306,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
                         ApplicationCount++;
 
                         if (ApplicationCount > ApplicationArray)
-			  ApplicationArray = (BYTE)((ApplicationArray << 1) + 1);
+                            ApplicationArray = (BYTE)((ApplicationArray << 1) + 1);
 
                         if (!(gifApplication = (GIFAPPLICATION **)realloc(gifApplication , sizeof(GIFAPPLICATION *) * ApplicationArray))) {
                             printf("Out of memory!");
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index ce9d878..ae63e92 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -46,6 +46,8 @@ FILE *fpGif = NULL;
 int main(int argc , char **argv)
 {
     BYTE *Image;
+    void *edata;
+    H5E_auto2_t func;
 
     /* compression structs */
     CHAR *HDFName = NULL;
@@ -62,7 +64,7 @@ int main(int argc , char **argv)
     int   ColorMapSize, InitCodeSize, Background, BitsPerPixel;
     int   j,nc;
     int   i;
-    int   numcols;
+    int   numcols = 0;
 
     BYTE pc2nc[256] , r1[256] , g1[256] , b1[256];
 
@@ -71,6 +73,10 @@ int main(int argc , char **argv)
     char *image_name = NULL;
     int idx;
 
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     /* Initialize h5tools lib */
     h5tools_init();
 
@@ -328,6 +334,8 @@ int main(int argc , char **argv)
     if (image_name != NULL)
         free(image_name);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return EXIT_SUCCESS;
 
 
@@ -338,5 +346,7 @@ out:
     if (image_name != NULL)
         free(image_name);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return EXIT_FAILURE;
 }