philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To reduce maintenance effort, delete the noerror- variants of the compiler flags files (#1033)

Browse Source 
* Avoid maintenance headaches: delete the `noerror-` variants of the
compiler flags files, since they essentially duplicate the `error-`
files modulo the replacement of `-Werror=` with `-W` and any changes in
comments.  (I verified the duplication with a script.)

For autoconf, reinstate the use of the `demote_errors` shell function to
derive the `noerror-` content from the `error-` content.  `demote_errors`
replaces `-Werror=` with `-W` when `WARNINGS_AS_ERRORS` is `no`.

Slightly reorder `configure.ac` so that the setting of
`WARNINGS_AS_ERRORS` takes effect before the `error-` files are sourced.

* Take a stab at updating the CMake files to match the changes I made to
the autoconf files to remove `noerror-` files.  I'm not much of a CMake
user so these changes are quite rough.

Looks like the duplication can be reduced with the introduction of a new
macro.

* Delete `noerror-` files from the MANIFEST.

* Reduce duplication in the CMake files: perform the
HDF5_ENABLE_WARNINGS_AS_ERRORS test once in the ADD_H5_FLAGS macro.

* Add a release note.
This commit is contained in:
David Young
2021-10-06 16:24:22 -05:00
committed by GitHub
parent a08059894b
commit 174f4275ba
16 changed files with 75 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/cmake_ext_mod/HDFMacros.cmake
View File

@@ -464,6 +464,9 @@ macro (ADD_H5_FLAGS h5_flag_var infile)
list (GET TEST_FLAG_STREAM ${line} str_flag)
string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
#message (TRACE "str_flag=${str_flag}")
if (NOT HDF5_ENABLE_WARNINGS_AS_ERRORS)
string (REGEX REPLACE "-Werror=" "-W" str_flag "${str_flag}")
endif ()
if (str_flag)
list (APPEND ${h5_flag_var} "${str_flag}")
endif ()