diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-05-01 20:07:26 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2014-05-07 18:30:31 (GMT) |
| commit | 6fa6bedf78981d336b66d55ca10a1d290d014101 (patch) | |
| tree | 01bcbe86eede14cc94f84e2ae0293652e82319db /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 01b79c6385d32e635b5720d8075a60fd50577c66 (diff) | |
| download | CMake-6fa6bedf78981d336b66d55ca10a1d290d014101.zip CMake-6fa6bedf78981d336b66d55ca10a1d290d014101.tar.gz CMake-6fa6bedf78981d336b66d55ca10a1d290d014101.tar.bz2 | |
LocalGenerator: Add a string overload for AppendFlags
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 7ffe84d..94e45e5 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -956,15 +956,15 @@ cmLocalUnixMakefileGenerator3 //---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, - const char* newFlags) + const std::string& newFlags) { - if(this->WatcomWMake && newFlags && *newFlags) + if(this->WatcomWMake && !newFlags.empty()) { std::string newf = newFlags; if(newf.find("\\\"") != newf.npos) { cmSystemTools::ReplaceString(newf, "\\\"", "\""); - this->cmLocalGenerator::AppendFlags(flags, newf.c_str()); + this->cmLocalGenerator::AppendFlags(flags, newf); return; } } @@ -972,6 +972,13 @@ void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, } //---------------------------------------------------------------------------- +void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, + const char* newFlags) +{ + this->cmLocalGenerator::AppendFlags(flags, newFlags); +} + +//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendRuleDepend(std::vector<std::string>& depends, |