summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-01-23 22:40:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-01-23 22:40:47 (GMT)
commit492d186a5ceb2da47ef952fe52f890dbc4071b20 (patch)
tree17d0368e7c665d5ceee5d6dbb077679a6d8f125e /config
parent9a97411a61b886c4f2b5417dce29157a010b47c1 (diff)
downloadhdf5-492d186a5ceb2da47ef952fe52f890dbc4071b20.zip
hdf5-492d186a5ceb2da47ef952fe52f890dbc4071b20.tar.gz
hdf5-492d186a5ceb2da47ef952fe52f890dbc4071b20.tar.bz2
Revert "Revert "Moved -Wunsuffixed-float-constants to the developer warnings.""
This reverts commit 6486e06545bf637d46e18a787395542f4fca143a.
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDFCompilerFlags.cmake7
-rw-r--r--config/gnu-flags4
2 files changed, 9 insertions, 2 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index c803384..99a8f56 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -151,7 +151,12 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
# Append more extra warning flags that only gcc 4.5+ know about
if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
- set (H5_CFLAGS1 "${H5_CFLAGS1} -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants")
+ set (H5_CFLAGS1 "${H5_CFLAGS1} -Wstrict-overflow=5 -Wjump-misses-init")
+ if (HDF5_ENABLE_DEV_WARNINGS)
+ set (H5_CFLAGS0 "${H5_CFLAGS0} -Wunsuffixed-float-constants")
+ else ()
+ set (H5_CFLAGS0 "${H5_CFLAGS0} -Wno-unsuffixed-float-constants")
+ endif ()
endif ()
# Append more extra warning flags that only gcc 4.6+ know about
diff --git a/config/gnu-flags b/config/gnu-flags
index a5f3258..eaa30a9 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -235,7 +235,9 @@ if test "X-gcc" = "X-$cc_vendor"; then
# gcc 4.5
if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 5; then
- H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
+ H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init"
+ DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wunsuffixed-float-constants"
+ NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS -Wno-unsuffixed-float-constants"
fi
# gcc 4.6