aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-24 11:56:17 -0400
committerGitHub <noreply@github.com>2018-08-24 11:56:17 -0400
commitbf98ce2bba30ff6a85e8e30303eec99142636be0 (patch)
treeeb0e310467d647ad68c626929c80476527df893c
parent7f11b9ffb5712e2889a74856caf7507bb5c90da1 (diff)
parent205df1058ef549f70f600b368604745fee863de9 (diff)
downloadgoogletest-bf98ce2bba30ff6a85e8e30303eec99142636be0.tar.gz
googletest-bf98ce2bba30ff6a85e8e30303eec99142636be0.tar.bz2
googletest-bf98ce2bba30ff6a85e8e30303eec99142636be0.zip
Merge pull request #1767 from jschloss-swift/issue_1735
Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
-rw-r--r--googletest/cmake/internal_utils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index 94702de3..8c1f9ba9 100644
--- 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}")