commit a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d
author Gennadiy Civil <gennadiycivil@users.noreply.github.com> Fri Aug 17 11:48:56 2018 -0400
committer GitHub <noreply@github.com> Fri Aug 17 11:48:56 2018 -0400
tree 32d0dac55ff598f9732ff57581044eabd24fa807
parent 421e7b4f29fc761c66d2773a1fc318a738a6d3da
parent 02a8ca87735601466d8c564344f9be493da84708

Merge branch 'master' into fix-msvc-d9025-warning

googletest/cmake/internal_utils.cmake

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 @@
       # 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()