diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-24 21:25:51 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-24 21:25:51 (GMT) |
| commit | ae9dc2d5f9016ef279ca9d0ca8ad9c8416e60df9 (patch) | |
| tree | da09ba5275eb3968977f45fac36b66a698170b9b | |
| parent | e54f5a14d28cf9eb1226ce7feab2e2600d3984b4 (diff) | |
| download | hdf5-ae9dc2d5f9016ef279ca9d0ca8ad9c8416e60df9.zip hdf5-ae9dc2d5f9016ef279ca9d0ca8ad9c8416e60df9.tar.gz hdf5-ae9dc2d5f9016ef279ca9d0ca8ad9c8416e60df9.tar.bz2 | |
Restrict errors to gcc 4.8 and above.
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 6 | ||||
| -rw-r--r-- | config/gnu-flags | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 02bc8b1..6dbaa64 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -96,6 +96,8 @@ if (NOT MSVC) # Add general CFlags for GCC versions 4.2 and above if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2) ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general") + endif () + if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8) ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general") endif () # gcc automatically inlines based on the optimization level @@ -140,12 +142,12 @@ if (NOT MSVC) ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.2-4.last") endif () - # Append warning flags for gcc 4.2-4.3 + # Append warning flags for gcc 4.2-4.3 if (CMAKE_C_COMPILER_VERSION VERSION_LESS_EQUAL 4.3 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2) ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.2-4.3") endif () - # Append warning flags for gcc 4.2-4.4 + # Append warning flags for gcc 4.2-4.4 if (CMAKE_C_COMPILER_VERSION VERSION_LESS_EQUAL 4.4 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2) ADD_H5_FLAGS (H5_CFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.2-4.4") endif () diff --git a/config/gnu-flags b/config/gnu-flags index f391d7b..7e69ede 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -190,6 +190,8 @@ if test "X-gcc" = "X-$cc_vendor"; then if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -gt 4; then H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments general)" + fi + if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8 -o $cc_vers_major -gt 4; then H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-general)" fi |