diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-06 21:12:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-06 21:12:43 (GMT) |
| commit | e31bb02d3813ba6ce4a0225315a5d8d71ade8431 (patch) | |
| tree | a81ee936f78b8c2393a796be078bf66e124b3737 | |
| parent | 279ea4f2a25ad8df1d9a677b4df71280a485ca08 (diff) | |
| download | hdf5-e31bb02d3813ba6ce4a0225315a5d8d71ade8431.zip hdf5-e31bb02d3813ba6ce4a0225315a5d8d71ade8431.tar.gz hdf5-e31bb02d3813ba6ce4a0225315a5d8d71ade8431.tar.bz2 | |
Remove flag from gfort-general in gfort-5, add /EHsc to Win C++
| -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 |