Merge pull request #1767 from jschloss-swift/issue_1735

Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…

Merge pull request #1767 from jschloss-swift/issue_1735
Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
bf98ce2b · Gennadiy Civil · GitHub · 7f11b9ff · 205df105 · bf98ce2b
Unverified Commit bf98ce2b authored Aug 24, 2018 by Gennadiy Civil Committed by GitHub Aug 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

googletest/cmake/internal_utils.cmake googletest/cmake/internal_utils.cmake +1 -1

No files found.
--- 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}")