summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-04-23 18:41:34 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-04-23 18:41:34 (GMT)
commit5ea58acf8a2bdf8ca19d4c86d9ef94fbc4ac449f (patch)
treeda1ee5cccec97216ffb73edd94815845b379e71f /src
parent1db039d1beee05d7349e153cef4cf642c907cc1e (diff)
parent43424a1392b662a29542bb70014c253162ccfe48 (diff)
downloadhdf5-5ea58acf8a2bdf8ca19d4c86d9ef94fbc4ac449f.zip
hdf5-5ea58acf8a2bdf8ca19d4c86d9ef94fbc4ac449f.tar.gz
hdf5-5ea58acf8a2bdf8ca19d4c86d9ef94fbc4ac449f.tar.bz2
Merge pull request #2525 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '43424a1392b662a29542bb70014c253162ccfe48': Add missing ')'. Add C++ warnings treated as error for autotools builds. Move macro ADD_H5_CFLAGS to cmake_ext_mod/HDFMacros.cmake and remove duplicate versions. Address PR suggestions and add overlooked GCC compiler version flags. Don't add general warnings flags for unsupported old versions of gcc and g++ (older than gcc/g++ 4.2). Correct gnu-cxxflags to determine warnings flags to be added based on C++ compiler version instead of C compiler version.
Diffstat (limited to 'src')
-rw-r--r--src/libhdf5.settings.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in
index 192fc6f..fb9deec 100644
--- a/src/libhdf5.settings.in
+++ b/src/libhdf5.settings.in
@@ -56,7 +56,7 @@ Languages:
C++: @HDF_CXX@
@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CXX_VERSION@
@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CXXFLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@
+@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @H5_ECXXFLAGS@
@BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@
@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @enable_shared@
@BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@