diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-29 14:23:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-29 14:24:06 (GMT) |
| commit | 894a41fc275b454e3d9da04b6e15244099269c74 (patch) | |
| tree | 188a5c25f553b2a87ef61c6b3346351cb94dc3b3 /Source/cmVisualStudioGeneratorOptions.cxx | |
| parent | 3272677e634629628a6293614fd169ff66d72e0d (diff) | |
| parent | 80767dd50e9898002253f383e9029dcc9da9f4c4 (diff) | |
| download | CMake-894a41fc275b454e3d9da04b6e15244099269c74.zip CMake-894a41fc275b454e3d9da04b6e15244099269c74.tar.gz CMake-894a41fc275b454e3d9da04b6e15244099269c74.tar.bz2 | |
Merge topic 'vs-simplify'
80767dd50e VS: Simplify XML code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1895
Diffstat (limited to 'Source/cmVisualStudioGeneratorOptions.cxx')
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 26fce4b..8b6f057 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -422,8 +422,7 @@ const std::string& cmVisualStudioGeneratorOptions::GetConfiguration() const } void cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions( - std::ostream& fout, const char* prefix, const char* suffix, - const std::string& lang) + std::ostream& fout, const char* prefix, const std::string& lang) { if (this->Defines.empty()) { return; @@ -462,12 +461,10 @@ void cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions( } this->OutputFlag(fout, prefix, tag, oss.str()); - fout << suffix; } void cmVisualStudioGeneratorOptions::OutputAdditionalIncludeDirectories( - std::ostream& fout, const char* prefix, const char* suffix, - const std::string& lang) + std::ostream& fout, const char* prefix, const std::string& lang) { if (this->Includes.empty()) { return; @@ -512,7 +509,6 @@ void cmVisualStudioGeneratorOptions::OutputAdditionalIncludeDirectories( } this->OutputFlag(fout, prefix, tag, oss.str()); - fout << suffix; } void cmVisualStudioGeneratorOptions::OutputFlagMap(std::ostream& fout, @@ -530,6 +526,5 @@ void cmVisualStudioGeneratorOptions::OutputFlagMap(std::ostream& fout, } this->OutputFlag(fout, indent, m.first.c_str(), oss.str()); - fout << "\n"; } } |