Add options to allow tools type selection and naming (#4046)

11 files changed, 203 insertions, 382 deletions

diff --git a/tools/src/h5copy/CMakeLists.txt b/tools/src/h5copy/CMakeLists.txt
index 5b79a85..6263fe6 100644
--- a/tools/src/h5copy/CMakeLists.txt
+++ b/tools/src/h5copy/CMakeLists.txt
@@ -4,39 +4,26 @@ project (HDF5_TOOLS_SRC_H5COPY C)
 # --------------------------------------------------------------------
 # Add the h5copy and test executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5copy ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
-  target_include_directories (h5copy PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5copy PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5copy ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
+target_include_directories (h5copy PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5copy PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5copy STATIC)
   target_link_libraries (h5copy PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5copy PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy")
-
-  set (H5_DEP_EXECUTABLES h5copy)
+else ()
+  TARGET_C_PROPERTIES (h5copy SHARED)
+  target_link_libraries (h5copy PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5copy PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5copy-shared ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
-  target_include_directories (h5copy-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5copy-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5copy-shared SHARED)
-  target_link_libraries (h5copy-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5copy-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5copy-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5copy)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5COPY_SRC_FORMAT h5copy)
-  else ()
-    clang_format (HDF5_H5COPY_SRC_FORMAT h5copy-shared)
-  endif ()
+  clang_format (HDF5_H5COPY_SRC_FORMAT h5copy)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 8de7c61..e6802b1 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -4,77 +4,50 @@ project (HDF5_TOOLS_SRC_H5DIFF C)
 # --------------------------------------------------------------------
 # Add the h5diff executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5diff
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
-  )
-  target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  #target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG)
+add_executable (h5diff
+    ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
+    ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+    ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
+)
+target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+#target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG)
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5diff STATIC)
   target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5diff PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5diff")
-
-  set (H5_DEP_EXECUTABLES h5diff)
+else ()
+  TARGET_C_PROPERTIES (h5diff SHARED)
+  target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
-if (BUILD_SHARED_LIBS)
-  add_executable (h5diff-shared
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
-  )
-  target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5diff-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  #target_compile_definitions (h5diff-shared PRIVATE H5_TOOLS_DEBUG)
-  TARGET_C_PROPERTIES (h5diff-shared SHARED)
-  target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5diff-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5diff-shared")
+set_target_properties (h5diff PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5diff")
 
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5diff-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5diff)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff)
-  else ()
-    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff-shared)
-  endif ()
+  clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff)
 endif ()
 
 if (H5_HAVE_PARALLEL)
-  if (BUILD_STATIC_LIBS)
-    add_executable (ph5diff
-        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
-    )
-    target_include_directories (ph5diff PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    target_compile_options(ph5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  add_executable (ph5diff
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
+  )
+  target_include_directories (ph5diff PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(ph5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  if (HDF5_BUILD_STATIC_TOOLS)
     TARGET_C_PROPERTIES (ph5diff STATIC)
     target_link_libraries (ph5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPI::MPI_C>")
-    set_target_properties (ph5diff PROPERTIES FOLDER tools)
-    set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff")
-    set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} ph5diff)
-  endif ()
-  if (BUILD_SHARED_LIBS)
-    add_executable (ph5diff-shared
-        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
-    )
-    target_include_directories (ph5diff-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    target_compile_options(ph5diff-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-    TARGET_C_PROPERTIES (ph5diff-shared SHARED)
-    target_link_libraries (ph5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPI::MPI_C>")
-    set_target_properties (ph5diff-shared PROPERTIES FOLDER tools)
-    set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff-shared")
-    set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} ph5diff-shared)
+  else ()
+    TARGET_C_PROPERTIES (ph5diff SHARED)
+    target_link_libraries (ph5diff PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPI::MPI_C>")
   endif ()
+  set_target_properties (ph5diff PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff")
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} ph5diff)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index 3284949..3cdffa2 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -4,57 +4,35 @@ project (HDF5_TOOLS_SRC_H5DUMP C)
 # --------------------------------------------------------------------
 # Add the h5dump executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5dump
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h
-  )
-  target_include_directories (h5dump PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5dump PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5dump
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h
+    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h
+)
+target_include_directories (h5dump PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5dump PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5dump STATIC)
   target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5dump PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
-
-  set (H5_DEP_EXECUTABLES h5dump)
+else ()
+  TARGET_C_PROPERTIES (h5dump SHARED)
+  target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5dump PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5dump-shared
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h
-      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h
-  )
-  target_include_directories (h5dump-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5dump-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5dump-shared SHARED)
-  target_link_libraries (h5dump-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5dump-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5dump)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump)
-  else ()
-    clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump-shared)
-  endif ()
+  clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt
index 2a7e3cb..4e48ad5 100644
--- a/tools/src/h5format_convert/CMakeLists.txt
+++ b/tools/src/h5format_convert/CMakeLists.txt
@@ -4,38 +4,26 @@ project (HDF5_TOOLS_SRC_H5FC C)
 # --------------------------------------------------------------------
 # Add the h5format_convert executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
-  target_include_directories (h5format_convert PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5format_convert PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
+target_include_directories (h5format_convert PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5format_convert PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5format_convert STATIC)
   target_link_libraries (h5format_convert PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5format_convert PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert")
-
-  set (H5_DEP_EXECUTABLES h5format_convert)
+else ()
+  TARGET_C_PROPERTIES (h5format_convert SHARED)
+  target_link_libraries (h5format_convert PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
-if (BUILD_SHARED_LIBS)
-  add_executable (h5format_convert-shared ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
-  target_include_directories (h5format_convert-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5format_convert-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5format_convert-shared SHARED)
-  target_link_libraries (h5format_convert-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5format_convert-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert-shared")
+set_target_properties (h5format_convert PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert")
 
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5format_convert-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5format_convert)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5FORMAT_SRC_FORMAT h5format_convert)
-  else ()
-    clang_format (HDF5_H5FORMAT_SRC_FORMAT h5format_convert-shared)
-  endif ()
+  clang_format (HDF5_H5FORMAT_SRC_FORMAT h5format_convert)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5import/CMakeLists.txt b/tools/src/h5import/CMakeLists.txt
index f8268a1..4d231ad 100644
--- a/tools/src/h5import/CMakeLists.txt
+++ b/tools/src/h5import/CMakeLists.txt
@@ -4,39 +4,26 @@ project (HDF5_TOOLS_SRC_H5IMPORT C)
 # --------------------------------------------------------------------
 # Add the h5import executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5import ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.h)
-  target_include_directories (h5import PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+add_executable (h5import ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.h)
+target_include_directories (h5import PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5import STATIC)
   target_link_libraries (h5import PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  #set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
-  set_target_properties (h5import PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import")
-
-  set (H5_DEP_EXECUTABLES h5import)
+else ()
+  TARGET_C_PROPERTIES (h5import SHARED)
+  target_link_libraries (h5import PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+#set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
+set_target_properties (h5import PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5import-shared ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.h)
-  target_include_directories (h5import-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (h5import-shared SHARED)
-  target_link_libraries (h5import-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  #set_target_properties (h5import-shared PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
-  set_target_properties (h5import-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5import-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5import)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5IMPORT_SRC_FORMAT h5import)
-  else ()
-    clang_format (HDF5_H5IMPORT_SRC_FORMAT h5import-shared)
-  endif ()
+  clang_format (HDF5_H5IMPORT_SRC_FORMAT h5import)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5jam/CMakeLists.txt b/tools/src/h5jam/CMakeLists.txt
index 7efd0d8..bcd7eca 100644
--- a/tools/src/h5jam/CMakeLists.txt
+++ b/tools/src/h5jam/CMakeLists.txt
@@ -4,59 +4,41 @@ project (HDF5_TOOLS_SRC_H5JAM C)
 # --------------------------------------------------------------------
 # Add the h5jam executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5jam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
-  target_include_directories (h5jam PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+add_executable (h5jam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
+target_include_directories (h5jam PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5jam STATIC)
   target_link_libraries (h5jam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5jam PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
+else ()
+  TARGET_C_PROPERTIES (h5jam SHARED)
+  target_link_libraries (h5jam PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5jam PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
 
-  add_executable (h5unjam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
-  target_include_directories (h5unjam PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+add_executable (h5unjam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
+target_include_directories (h5unjam PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5unjam STATIC)
   target_link_libraries (h5unjam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5unjam PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
-
-  set (H5_DEP_EXECUTABLES
-      h5jam
-      h5unjam
-  )
+else ()
+  TARGET_C_PROPERTIES (h5unjam SHARED)
+  target_link_libraries (h5unjam PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5unjam PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5jam-shared ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
-  target_include_directories (h5jam-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (h5jam-shared SHARED)
-  target_link_libraries (h5jam-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5jam-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam-shared")
-
-  add_executable (h5unjam-shared ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
-  target_include_directories (h5unjam-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (h5unjam-shared SHARED)
-  target_link_libraries (h5unjam-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5unjam-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
-      h5jam-shared
-      h5unjam-shared
-  )
-endif ()
+set (H5_DEP_EXECUTABLES
+    h5jam
+    h5unjam
+)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5JAM_SRC_FORMAT h5jam)
-    clang_format (HDF5_H5UNJAM_SRC_FORMAT h5unjam)
-  else ()
-    clang_format (HDF5_H5JAM_SRC_FORMAT h5jam-shared)
-    clang_format (HDF5_H5UNJAM_SRC_FORMAT h5unjam-shared)
-  endif ()
+  clang_format (HDF5_H5JAM_SRC_FORMAT h5jam)
+  clang_format (HDF5_H5UNJAM_SRC_FORMAT h5unjam)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt
index 67122a1..f8f7fff 100644
--- a/tools/src/h5ls/CMakeLists.txt
+++ b/tools/src/h5ls/CMakeLists.txt
@@ -4,41 +4,27 @@ project (HDF5_TOOLS_SRC_H5LS C)
 #-----------------------------------------------------------------------------
 # Add the h5ls executable
 #-----------------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
-  target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5ls PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  #target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG)
+add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
+target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5ls PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+#target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG)
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5ls STATIC)
   target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5ls PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls")
-
-  set (H5_DEP_EXECUTABLES h5ls)
+else ()
+  TARGET_C_PROPERTIES (h5ls SHARED)
+  target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5ls PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
-  target_include_directories (h5ls-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5ls-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  #target_compile_definitions(h5ls-shared PRIVATE H5_TOOLS_DEBUG)
-  TARGET_C_PROPERTIES (h5ls-shared SHARED)
-  target_link_libraries (h5ls-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5ls-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5ls-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5ls)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5LS_SRC_FORMAT h5ls)
-  else ()
-    clang_format (HDF5_H5LS_SRC_FORMAT h5ls-shared)
-  endif ()
+  clang_format (HDF5_H5LS_SRC_FORMAT h5ls)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5perf/CMakeLists.txt b/tools/src/h5perf/CMakeLists.txt
index 6ff5200..2237f74 100644
--- a/tools/src/h5perf/CMakeLists.txt
+++ b/tools/src/h5perf/CMakeLists.txt
@@ -10,7 +10,7 @@ set (h5perf_serial_SOURCES
 )
 add_executable (h5perf_serial ${h5perf_serial_SOURCES})
 target_include_directories (h5perf_serial PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-if (BUILD_STATIC_LIBS)
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5perf_serial STATIC)
   target_link_libraries (h5perf_serial PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 else ()
@@ -36,7 +36,7 @@ if (H5_HAVE_PARALLEL)
   )
   add_executable (h5perf ${h5perf_SOURCES})
   target_include_directories (h5perf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (BUILD_STATIC_LIBS)
+  if (HDF5_BUILD_STATIC_TOOLS)
     TARGET_C_PROPERTIES (h5perf STATIC)
     target_link_libraries (h5perf PRIVATE ${LINK_LIBS} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}  "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPI::MPI_C>")
   else ()
@@ -46,7 +46,7 @@ if (H5_HAVE_PARALLEL)
   set_target_properties (h5perf PROPERTIES FOLDER perform)
   set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5perf")
 
-  set (H5_DEP_EXECUTABLES h5perf)
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5perf)
 
   if (HDF5_ENABLE_FORMATTERS)
     clang_format (HDF5_TOOLS_SRC_H5PERF_h5perf_FORMAT h5perf)
diff --git a/tools/src/h5repack/CMakeLists.txt b/tools/src/h5repack/CMakeLists.txt
index ea1ee80..f215b05 100644
--- a/tools/src/h5repack/CMakeLists.txt
+++ b/tools/src/h5repack/CMakeLists.txt
@@ -15,39 +15,26 @@ set (REPACK_COMMON_SOURCES
     ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack.h
 )
 
-if (BUILD_STATIC_LIBS)
-  add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-  target_include_directories (h5repack PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5repack PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
+target_include_directories (h5repack PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5repack PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5repack STATIC)
   target_link_libraries (h5repack PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5repack PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repack")
-
-  set (H5_DEP_EXECUTABLES h5repack)
+else ()
+  TARGET_C_PROPERTIES (h5repack SHARED)
+  target_link_libraries (h5repack PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5repack PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repack")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5repack-shared ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-  target_include_directories (h5repack-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5repack-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5repack-shared SHARED)
-  target_link_libraries (h5repack-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5repack-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repack-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repack-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5repack)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5REPACK_SRC_FORMAT h5repack)
-  else ()
-    clang_format (HDF5_H5REPACK_SRC_FORMAT h5repack-shared)
-  endif ()
+  clang_format (HDF5_H5REPACK_SRC_FORMAT h5repack)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/h5stat/CMakeLists.txt b/tools/src/h5stat/CMakeLists.txt
index c3aef5f..a7b8e5c 100644
--- a/tools/src/h5stat/CMakeLists.txt
+++ b/tools/src/h5stat/CMakeLists.txt
@@ -4,39 +4,26 @@ project (HDF5_TOOLS_SRC_H5STAT C)
 # --------------------------------------------------------------------
 # Add the h5stat executables
 # --------------------------------------------------------------------
-if (BUILD_STATIC_LIBS)
-  add_executable (h5stat ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
-  target_include_directories (h5stat PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5stat PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5stat ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
+target_include_directories (h5stat PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5stat PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5stat STATIC)
   target_link_libraries (h5stat PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5stat PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat")
-
-  set (H5_DEP_EXECUTABLES h5stat)
+else ()
+  TARGET_C_PROPERTIES (h5stat SHARED)
+  target_link_libraries (h5stat PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
+set_target_properties (h5stat PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat")
 
-if (BUILD_SHARED_LIBS)
-  add_executable (h5stat-shared ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
-  target_include_directories (h5stat-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5stat-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5stat-shared SHARED)
-  target_link_libraries (h5stat-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5stat-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5stat-shared)
-endif ()
+set (H5_DEP_EXECUTABLES h5stat)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5STAT_SRC_FORMAT h5stat)
-  else ()
-    clang_format (HDF5_H5STAT_SRC_FORMAT h5stat-shared)
-  endif ()
+  clang_format (HDF5_H5STAT_SRC_FORMAT h5stat)
 endif ()
 
 ##############################################################################
diff --git a/tools/src/misc/CMakeLists.txt b/tools/src/misc/CMakeLists.txt
index 62bd443..1b45246 100644
--- a/tools/src/misc/CMakeLists.txt
+++ b/tools/src/misc/CMakeLists.txt
@@ -5,122 +5,88 @@ project (HDF5_TOOLS_SRC_MISC C)
 # Add the misc executables
 # --------------------------------------------------------------------
 #-- Misc Executables
-if (BUILD_STATIC_LIBS)
-  add_executable (h5debug ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
-  target_include_directories (h5debug PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5debug PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5debug ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
+target_include_directories (h5debug PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5debug PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5debug STATIC)
   target_link_libraries (h5debug PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5debug PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
+else ()
+  TARGET_C_PROPERTIES (h5debug SHARED)
+  target_link_libraries (h5debug PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5debug PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
 
-  add_executable (h5repart ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
-  target_include_directories (h5repart PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5repart PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5repart ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
+target_include_directories (h5repart PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5repart PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5repart STATIC)
   target_link_libraries (h5repart PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5repart PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
+else ()
+  TARGET_C_PROPERTIES (h5repart SHARED)
+  target_link_libraries (h5repart PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5repart PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
 
-  add_executable (h5mkgrp ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
-  target_include_directories (h5mkgrp PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5mkgrp PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5mkgrp ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
+target_include_directories (h5mkgrp PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5mkgrp PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5mkgrp STATIC)
   target_link_libraries (h5mkgrp PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp")
+else ()
+  TARGET_C_PROPERTIES (h5mkgrp SHARED)
+  target_link_libraries (h5mkgrp PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp")
 
-  add_executable (h5clear ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
-  target_include_directories (h5clear PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5clear PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5clear ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
+target_include_directories (h5clear PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5clear PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5clear STATIC)
   target_link_libraries (h5clear PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5clear PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear")
+else ()
+  TARGET_C_PROPERTIES (h5clear SHARED)
+  target_link_libraries (h5clear PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5clear PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear")
 
-  add_executable (h5delete ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5delete.c)
-  target_include_directories (h5delete PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5delete PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+add_executable (h5delete ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5delete.c)
+target_include_directories (h5delete PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(h5delete PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+if (HDF5_BUILD_STATIC_TOOLS)
   TARGET_C_PROPERTIES (h5delete STATIC)
   target_link_libraries (h5delete PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-  set_target_properties (h5delete PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5delete")
-
-  set (H5_DEP_EXECUTABLES
-      h5debug
-      h5repart
-      h5mkgrp
-      h5clear
-      h5delete
-  )
+else ()
+  TARGET_C_PROPERTIES (h5delete SHARED)
+  target_link_libraries (h5delete PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
 endif ()
-if (BUILD_SHARED_LIBS)
-  add_executable (h5debug-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
-  target_include_directories (h5debug-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (h5debug-shared SHARED)
-  target_compile_options(h5debug-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_link_libraries (h5debug-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5debug-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug-shared")
+set_target_properties (h5delete PROPERTIES FOLDER tools)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5delete")
 
-  add_executable (h5repart-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
-  target_include_directories (h5repart-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5repart-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5repart-shared SHARED)
-  target_link_libraries (h5repart-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5repart-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart-shared")
-
-  add_executable (h5mkgrp-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
-  target_include_directories (h5mkgrp-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5mkgrp-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5mkgrp-shared SHARED)
-  target_link_libraries (h5mkgrp-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5mkgrp-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp-shared")
-
-  add_executable (h5clear-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
-  target_include_directories (h5clear-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5clear-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5clear-shared SHARED)
-  target_link_libraries (h5clear-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5clear-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear-shared")
-
-  add_executable (h5delete-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5delete.c)
-  target_include_directories (h5delete-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  target_compile_options(h5delete-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  TARGET_C_PROPERTIES (h5delete-shared SHARED)
-  target_link_libraries (h5delete-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (h5delete-shared PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5delete-shared")
-
-  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
-      h5debug-shared
-      h5repart-shared
-      h5mkgrp-shared
-      h5clear-shared
-      h5delete-shared
-  )
-endif ()
+set (H5_DEP_EXECUTABLES
+    h5debug
+    h5repart
+    h5mkgrp
+    h5clear
+    h5delete
+)
 
 #-----------------------------------------------------------------------------
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (BUILD_STATIC_LIBS)
-    clang_format (HDF5_H5DEBUG_SRC_FORMAT h5debug)
-    clang_format (HDF5_H5REPART_SRC_FORMAT h5repart)
-    clang_format (HDF5_H5MKGRP_SRC_FORMAT h5mkgrp)
-    clang_format (HDF5_H5CLEAR_SRC_FORMAT h5clear)
-    clang_format (HDF5_H5DELETE_SRC_FORMAT h5delete)
-  else ()
-    clang_format (HDF5_H5DEBUG_SRC_FORMAT h5debug-shared)
-    clang_format (HDF5_H5REPART_SRC_FORMAT h5repart-shared)
-    clang_format (HDF5_H5MKGRP_SRC_FORMAT h5mkgrp-shared)
-    clang_format (HDF5_H5CLEAR_SRC_FORMAT h5clear-shared)
-    clang_format (HDF5_H5DELETE_SRC_FORMAT h5delete-shared)
-  endif ()
+  clang_format (HDF5_H5DEBUG_SRC_FORMAT h5debug)
+  clang_format (HDF5_H5REPART_SRC_FORMAT h5repart)
+  clang_format (HDF5_H5MKGRP_SRC_FORMAT h5mkgrp)
+  clang_format (HDF5_H5CLEAR_SRC_FORMAT h5clear)
+  clang_format (HDF5_H5DELETE_SRC_FORMAT h5delete)
 endif ()
 
 ##############################################################################