Merge pull request #1767 from jschloss-swift/issue_1735

Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
This commit is contained in:
Gennadiy Civil 2018-08-24 11:56:17 -04:00 committed by GitHub
commit bf98ce2bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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}")