Merge pull request #1767 from jschloss-swift/issue_1735

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