Merge of clang-format changes from develop

1 files changed, 64 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e1d037..f60d39b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -664,6 +664,42 @@ set (H5Z_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5Z" "${H5Z_HDRS}" "${H5Z_SOURCES}" )
 
+set (H5_MODULE_HEADERS
+    ${HDF5_SRC_DIR}/H5Amodule.h
+    ${HDF5_SRC_DIR}/H5ACmodule.h
+    ${HDF5_SRC_DIR}/H5Bmodule.h
+    ${HDF5_SRC_DIR}/H5B2module.h
+    ${HDF5_SRC_DIR}/H5Cmodule.h
+    ${HDF5_SRC_DIR}/H5CXmodule.h
+    ${HDF5_SRC_DIR}/H5Dmodule.h
+    ${HDF5_SRC_DIR}/H5Emodule.h
+    ${HDF5_SRC_DIR}/H5EAmodule.h
+    ${HDF5_SRC_DIR}/H5Fmodule.h
+    ${HDF5_SRC_DIR}/H5FAmodule.h
+    ${HDF5_SRC_DIR}/H5FDdrvr_module.h
+    ${HDF5_SRC_DIR}/H5FDmodule.h
+    ${HDF5_SRC_DIR}/H5FLmodule.h
+    ${HDF5_SRC_DIR}/H5FSmodule.h
+    ${HDF5_SRC_DIR}/H5Gmodule.h
+    ${HDF5_SRC_DIR}/H5HFmodule.h
+    ${HDF5_SRC_DIR}/H5HGmodule.h
+    ${HDF5_SRC_DIR}/H5HLmodule.h
+    ${HDF5_SRC_DIR}/H5Imodule.h
+    ${HDF5_SRC_DIR}/H5Lmodule.h
+    ${HDF5_SRC_DIR}/H5MFmodule.h
+    ${HDF5_SRC_DIR}/H5MPmodule.h
+    ${HDF5_SRC_DIR}/H5Omodule.h
+    ${HDF5_SRC_DIR}/H5Pmodule.h
+    ${HDF5_SRC_DIR}/H5PBmodule.h
+    ${HDF5_SRC_DIR}/H5PLmodule.h
+    ${HDF5_SRC_DIR}/H5Rmodule.h
+    ${HDF5_SRC_DIR}/H5Smodule.h
+    ${HDF5_SRC_DIR}/H5SLmodule.h
+    ${HDF5_SRC_DIR}/H5SMmodule.h
+    ${HDF5_SRC_DIR}/H5Tmodule.h
+    ${HDF5_SRC_DIR}/H5Zmodule.h
+)
+
 set (common_SRCS
     ${H5_SOURCES}
     ${H5A_SOURCES}
@@ -816,6 +852,7 @@ set (H5_PRIVATE_HEADERS
     ${HDF5_SRC_DIR}/H5Lpkg.h
     ${HDF5_SRC_DIR}/H5Lprivate.h
 
+    ${HDF5_SRC_DIR}/H5MFpkg.h
     ${HDF5_SRC_DIR}/H5MFprivate.h
 
     ${HDF5_SRC_DIR}/H5MMprivate.h
@@ -1031,6 +1068,13 @@ else ()
   endif ()
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_SRC_DETECT_FORMAT ${HDF5_SRC_DIR}/H5detect.c)
+endif ()
+
 add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
 target_include_directories (H5make_libsettings PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 target_compile_definitions(H5make_libsettings PUBLIC ${HDF_EXTRA_C_FLAGS} ${HDF_EXTRA_FLAGS})
@@ -1040,6 +1084,13 @@ target_link_libraries (H5make_libsettings
     PRIVATE $<$<PLATFORM_ID:Emscripten>:"-O0">
 )
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_SRC_LIBSETTINGS_FORMAT H5make_libsettings)
+endif ()
+
 add_custom_command (
     OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
            ${HDF5_BINARY_DIR}/gen_SRCS.stamp2
@@ -1076,7 +1127,7 @@ if (NOT ONLY_SHARED_LIBS)
   set (gen_SRCS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c ${HDF5_BINARY_DIR}/H5lib_settings.c)
   add_custom_target (gen_${HDF5_LIB_TARGET} ALL DEPENDS ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp1 ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp2)
 
-  add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
+  add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS} ${H5_MODULE_HEADERS})
   target_include_directories (${HDF5_LIB_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_BINARY_DIR}>"
@@ -1112,7 +1163,7 @@ if (BUILD_SHARED_LIBS)
   set (shared_gen_SRCS ${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c ${HDF5_BINARY_DIR}/shared/H5lib_settings.c)
   add_custom_target (gen_${HDF5_LIBSH_TARGET} ALL DEPENDS ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1 ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp2)
 
-  add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
+  add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS} ${H5_MODULE_HEADERS})
   target_include_directories (${HDF5_LIBSH_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       PUBLIC "$<$<BOOL:${HDF5_ENABLE_HDFS}>:${HDFS_INCLUDE_DIR}>"
@@ -1143,6 +1194,17 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 #-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_SRC_FORMAT ${HDF5_LIB_TARGET})
+  else ()
+    clang_format (HDF5_SRC_FORMAT ${HDF5_LIBSH_TARGET})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 if (NOT HDF5_INSTALL_NO_DEVELOPMENT)