From e31bb02d3813ba6ce4a0225315a5d8d71ade8431 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 6 Apr 2020 16:12:43 -0500 Subject: Remove flag from gfort-general in gfort-5, add /EHsc to Win C++ --- config/cmake/HDFCXXCompilerFlags.cmake | 2 ++ config/gnu-warnings/gfort-general | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v0.12