diff options
| author | Clemens Wasser <clemens.wasser@gmail.com> | 2022-01-25 20:39:49 (GMT) |
|---|---|---|
| committer | Clemens Wasser <clemens.wasser@gmail.com> | 2022-01-25 20:39:49 (GMT) |
| commit | 5c3f188beffb972571a011478ad5a28e89a186a3 (patch) | |
| tree | ea3aea90fe5c78ab360251b0b37aef186d9db2c3 | |
| parent | 850bdc4203f4599fceaed2ae9ba21c53e71fd0fb (diff) | |
| download | CMake-5c3f188beffb972571a011478ad5a28e89a186a3.zip CMake-5c3f188beffb972571a011478ad5a28e89a186a3.tar.gz CMake-5c3f188beffb972571a011478ad5a28e89a186a3.tar.bz2 | |
GlobalNinjaGenerator: Add EncodeLiteralInplace which doesn't copy
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 16 | ||||
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 19c4ee3..8fb0d1d 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -166,14 +166,18 @@ std::string cmGlobalNinjaGenerator::EncodeRuleName(std::string const& name) std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string& lit) { std::string result = lit; - cmSystemTools::ReplaceString(result, "$", "$$"); - cmSystemTools::ReplaceString(result, "\n", "$\n"); + EncodeLiteralInplace(result); + return result; +} + +void cmGlobalNinjaGenerator::EncodeLiteralInplace(std::string& lit) +{ + cmSystemTools::ReplaceString(lit, "$", "$$"); + cmSystemTools::ReplaceString(lit, "\n", "$\n"); if (this->IsMultiConfig()) { - cmSystemTools::ReplaceString(result, - cmStrCat('$', this->GetCMakeCFGIntDir()), + cmSystemTools::ReplaceString(lit, cmStrCat('$', this->GetCMakeCFGIntDir()), this->GetCMakeCFGIntDir()); } - return result; } std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path) @@ -185,7 +189,7 @@ std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path) else std::replace(result.begin(), result.end(), '/', '\\'); #endif - result = this->EncodeLiteral(result); + this->EncodeLiteralInplace(result); cmSystemTools::ReplaceString(result, " ", "$ "); cmSystemTools::ReplaceString(result, ":", "$:"); return result; diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 84fc06c..ac66944 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -77,6 +77,7 @@ public: static std::string EncodeRuleName(std::string const& name); std::string EncodeLiteral(const std::string& lit); + void EncodeLiteralInplace(std::string& lit); std::string EncodePath(const std::string& path); std::unique_ptr<cmLinkLineComputer> CreateLinkLineComputer( |