summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-01-24 15:57:39 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-01-24 15:57:39 (GMT)
commit5b92b4d362546c213f684e515451be116dd8d281 (patch)
treee5a310c64f9746ff1619a19940a18d279411d8af /config/cmake
parentbf89ea471133c84cc6af1e084da6b474ff04e467 (diff)
parent590aaff33046df99a4d88ba59e4b461e060b36e4 (diff)
downloadhdf5-5b92b4d362546c213f684e515451be116dd8d281.zip
hdf5-5b92b4d362546c213f684e515451be116dd8d281.tar.gz
hdf5-5b92b4d362546c213f684e515451be116dd8d281.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '590aaff33046df99a4d88ba59e4b461e060b36e4': Optimized the floating point comparisons a little bit. Fix for failing h5diff tests involving floating-point compares. Removed H5_DEC_ENUM Revert "Revert "Moved -Wunsuffixed-float-constants to the developer warnings."" Revert "Moved -Wunsuffixed-float-constants to the developer warnings." Moved -Wunsuffixed-float-constants to the developer warnings. Fixed a bug in testpar/t_cache.c concerning checking expected vs. actual cache entry reads and writes.
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/HDFCompilerFlags.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 100ada3..ea85736 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -176,7 +176,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