diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-18 03:27:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 03:27:19 (GMT) |
| commit | d1c1aac78160ae31353d9fe1bb1171353986a4f1 (patch) | |
| tree | 6ef9ec2b796c7d47178386ae645c24366b3390fe /googletest | |
| parent | 85b572394b53f61b71ddb4cd69702b88d3332a55 (diff) | |
| parent | a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (diff) | |
| download | googletest-d1c1aac78160ae31353d9fe1bb1171353986a4f1.zip googletest-d1c1aac78160ae31353d9fe1bb1171353986a4f1.tar.gz googletest-d1c1aac78160ae31353d9fe1bb1171353986a4f1.tar.bz2 | |
Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning
Remove default /EHsc compiler flag
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index b78dbcc..566c02f 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -38,6 +38,11 @@ macro(fix_default_compiler_settings_) # We prefer more strict warning checking for building Google Test. # Replaces /W3 with /W4 in defaults. string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}") + + # Prevent D9025 warning for targets that have exception handling + # turned off (/EHs-c- flag). Where required, exceptions are explicitly + # re-enabled using the cxx_exception_flags variable. + string(REPLACE "/EHsc" "" ${flag_var} "${${flag_var}}") endforeach() endif() endmacro() |