commit 205df1058ef549f70f600b368604745fee863de9
author Gennadiy Civil <gennadiycivil@users.noreply.github.com> Fri Aug 24 11:30:02 2018 -0400
committer GitHub <noreply@github.com> Fri Aug 24 11:30:02 2018 -0400
tree eb0e310467d647ad68c626929c80476527df893c
parent 6de39826aa190a07179a8104c00ad11ea20d8679
parent 7f11b9ffb5712e2889a74856caf7507bb5c90da1

Merge branch 'master' into issue_1735

googletest/cmake/internal_utils.cmake

diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index 94702de..8c1f9ba 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -143,7 +143,7 @@
   set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
 
   # For building gtest's own tests and samples.
-  set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}")
+  set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
   set(cxx_no_exception
     "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
   set(cxx_default "${cxx_exception}")