Merge pull request #1767 from jschloss-swift/issue_1735

Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
7 years ago · bf98ce2bba
parent 7f11b9ffb5 205df1058e
commit bf98ce2bba
1 changed files with 1 additions and 1 deletions
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@ -143,7 +143,7 @@ macro(config_compiler_and_linker)
  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}")