diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-06 21:12:43 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:31:58 (GMT) |
commit | dc86e0ec5d8ba28d3ca9e45ff5d26a0429700b13 (patch) | |
tree | 772324e858a1491f670614c761bc44f57a2afd2f /config | |
parent | af9988616719ce12f810aba7282a385df95cc2f9 (diff) | |
download | hdf5-dc86e0ec5d8ba28d3ca9e45ff5d26a0429700b13.zip hdf5-dc86e0ec5d8ba28d3ca9e45ff5d26a0429700b13.tar.gz hdf5-dc86e0ec5d8ba28d3ca9e45ff5d26a0429700b13.tar.bz2 |
Remove flag from gfort-general in gfort-5, add /EHsc to Win C++
Diffstat (limited to 'config')
-rw-r--r-- | config/cmake/HDFCXXCompilerFlags.cmake | 2 | ||||
-rw-r--r-- | config/gnu-warnings/gfort-general | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake index d828c10..bf22886 100644 --- a/config/cmake/HDFCXXCompilerFlags.cmake +++ b/config/cmake/HDFCXXCompilerFlags.cmake @@ -155,6 +155,8 @@ if (NOT MSVC) # ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.5") # endif () #endif () +else () + list (APPEND HDF5_CMAKE_CXX_FLAGS "/EHsc") endif () #----------------------------------------------------------------------------- diff --git a/config/gnu-warnings/gfort-general b/config/gnu-warnings/gfort-general index 86b09b1..4028316 100644 --- a/config/gnu-warnings/gfort-general +++ b/config/gnu-warnings/gfort-general @@ -9,5 +9,4 @@ -Wimplicit-interface -Wsurprising -Wunderflow --Wuse-without-only -pedantic |