Misc normalization with develop (#3436)

Mostly .github and config directories

5 files changed, 59 insertions, 44 deletions

diff --git a/config/cmake/ZLIB/zlib-config.cmake.in b/config/cmake/ZLIB/zlib-config.cmake.in
index 307896b..9e6ef48 100644
--- a/config/cmake/ZLIB/zlib-config.cmake.in
+++ b/config/cmake/ZLIB/zlib-config.cmake.in
@@ -30,7 +30,7 @@ set (${ZLIB_PACKAGE_NAME}_VERSION_MINOR  @ZLIB_VERSION_MINOR@)
 
 #-----------------------------------------------------------------------------
 # Don't include targets if this file is being picked up by another
-# project which has already build ZLIB as a subproject
+# project which has already built ZLIB as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@ZLIB_PACKAGE@")
   include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE@@ZLIB_PACKAGE_EXT@-targets.cmake)
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 326f1b6..ed6cc6d 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -28,6 +28,7 @@ Linking Options:
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
                        Archiver: @CMAKE_AR@
+                       AR_FLAGS: 
                          Ranlib: @CMAKE_RANLIB@
 
 Languages:
@@ -44,48 +45,48 @@ Languages:
                Static C Library: @H5_ENABLE_STATIC_LIB@
 
                         Fortran: @HDF5_BUILD_FORTRAN@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@                  Fortran Flags: @CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               AM Fortran Flags: @AM_FCFLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
+               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
+                  Fortran Flags: @CMAKE_Fortran_FLAGS@
+               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
+               AM Fortran Flags: @AM_FCFLAGS@
+         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
+         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
+               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
 
                             C++: @HDF5_BUILD_CPP_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
-@BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: @H5_ENABLE_STATIC_LIB@
+                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
+                      C++ Flags: @CMAKE_CXX_FLAGS@
+                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
+                   AM C++ Flags: @AM_CXXFLAGS@
+             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
+             Static C++ Library: @H5_ENABLE_STATIC_LIB@
 
-                            JAVA: @HDF5_BUILD_JAVA@
-@BUILD_JAVA_CONDITIONAL_TRUE@                 JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
+                           JAVA: @HDF5_BUILD_JAVA@
+                  JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
 
 Features:
 ---------
-                   Parallel HDF5: @HDF5_ENABLE_PARALLEL@
-Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
-              Large Parallel I/O: @LARGE_PARALLEL_IO@
-              High-level library: @HDF5_BUILD_HL_LIB@
-                Build HDF5 Tests: @BUILD_TESTING@
-                Build HDF5 Tools: @HDF5_BUILD_TOOLS@
-     Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
-                    Threadsafety: @HDF5_ENABLE_THREADSAFE@
-             Default API mapping: @DEFAULT_API_VERSION@
-  With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
-          I/O filters (external): @EXTERNAL_FILTERS@
-                             MPE: @H5_HAVE_LIBLMPE@
-                      Direct VFD: @H5_HAVE_DIRECT@
-                      Mirror VFD: @H5_HAVE_MIRROR_VFD@
-              (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
-            (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
-  Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
-                     API Tracing: @HDF5_ENABLE_TRACE@
-            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
- Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
-          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-                Use file locking: @HDF5_FILE_LOCKING_SETTING@
-       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
-    Optimization Instrumentation: @HDF5_Enable_Instrument@
+                     Parallel HDF5: @HDF5_ENABLE_PARALLEL@
+  Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
+                Large Parallel I/O: @LARGE_PARALLEL_IO@
+                High-level library: @HDF5_BUILD_HL_LIB@
+                  Build HDF5 Tests: @BUILD_TESTING@
+                  Build HDF5 Tools: @HDF5_BUILD_TOOLS@
+       Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
+                      Threadsafety: @HDF5_ENABLE_THREADSAFE@
+               Default API mapping: @DEFAULT_API_VERSION@
+    With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
+            I/O filters (external): @EXTERNAL_FILTERS@
+                               MPE: @H5_HAVE_LIBLMPE@
+                        Direct VFD: @H5_HAVE_DIRECT@
+                        Mirror VFD: @H5_HAVE_MIRROR_VFD@
+                (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
+              (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
+    Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
+                       API Tracing: @HDF5_ENABLE_TRACE@
+              Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
+   Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
+            Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
+                  Use file locking: @HDF5_FILE_LOCKING_SETTING@
+         Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
+      Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/gnu-warnings/developer-general b/config/gnu-warnings/developer-general
index 460b874..79ecd6a 100644
--- a/config/gnu-warnings/developer-general
+++ b/config/gnu-warnings/developer-general
@@ -1,10 +1,17 @@
 # (suggestions from gcc, not code problems)
 -Waggregate-return
 -Wdisabled-optimization
--Winline
 -Wmissing-format-attribute
 -Wmissing-noreturn
 -Wswitch-default
 -Wswitch-enum
 -Wunsafe-loop-optimizations
 -Wunused-macros
+# -Winline warnings aren't included here because, for at least
+# GNU compilers, this flag appears to conflict specifically with
+# the -Og optimization level flag added for Debug and Developer
+# builds and will produce warnings about functions not being
+# considered for inlining. The flag will be added to the list
+# of compiler flags separately if developer warnings are enabled
+# and the build type is not Debug or Developer
+#-Winline
diff --git a/config/intel-warnings/developer-general b/config/intel-warnings/developer-general
index fae56f0..861218e 100644
--- a/config/intel-warnings/developer-general
+++ b/config/intel-warnings/developer-general
@@ -1,4 +1,11 @@
--Winline
 -Wreorder
 -Wport
 -Wstrict-aliasing
+# -Winline warnings aren't included here because, for at least
+# GNU compilers, this flag appears to conflict specifically with
+# the -Og optimization level flag added for Debug and Developer
+# builds and will produce warnings about functions not being
+# considered for inlining. The flag will be added to the list
+# of compiler flags separately if developer warnings are enabled
+# and the build type is not Debug or Developer
+#-Winline
diff --git a/config/sanitizer/README.md b/config/sanitizer/README.md
index 0d5fb6c..b33c100 100644
--- a/config/sanitizer/README.md
+++ b/config/sanitizer/README.md
@@ -53,7 +53,7 @@ These obviously force the standard to be required, and also disables compiler-sp
 
 ## Sanitizer Builds [`sanitizers.cmake`](sanitizers.cmake)
 
-Sanitizers are tools that perform checks during a program’s runtime and returns issues, and as such, along with unit testing, code coverage and static analysis, is another tool to add to the programmers toolbox. And of course, like the previous tools, are tragically simple to add into any project using CMake, allowing any project and developer to quickly and easily use.
+Sanitizers are tools that perform checks during a program's runtime and return issues, and as such, along with unit testing, code coverage and static analysis, are another tool to add to the programmer's toolbox. And, of course, like the previous tools, they are simple to add to any project using CMake, allowing any project and developer to quickly and easily use them.
 
 A quick rundown of the tools available, and what they do:
 - [LeakSanitizer](https://clang.llvm.org/docs/LeakSanitizer.html) detects memory leaks, or issues where memory is allocated and never deallocated, causing programs to slowly consume more and more memory, eventually leading to a crash.
@@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES
 )
 
 cmake_format(TARGET_NAME ${CMAKE_FILES})
-```
\ No newline at end of file
+```