diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-08 05:29:59 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:35 (GMT) |
commit | 215b1addf09359507281359cd7d478c61c01a9f2 (patch) | |
tree | 3c6feb2cda4b6d2d75916240d10b50ffc6123459 /Source/cmLocalGenerator.h | |
parent | 4c53997f3880785953e3ab6c811626b85ee67510 (diff) | |
download | CMake-215b1addf09359507281359cd7d478c61c01a9f2.zip CMake-215b1addf09359507281359cd7d478c61c01a9f2.tar.gz CMake-215b1addf09359507281359cd7d478c61c01a9f2.tar.bz2 |
stringapi: Take strings in escaping functions
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index c1deb09..633be5d 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -150,7 +150,8 @@ public: const char* config); ///! Append flags to a string. virtual void AppendFlags(std::string& flags, const char* newFlags); - virtual void AppendFlagEscape(std::string& flags, const char* rawFlag); + virtual void AppendFlagEscape(std::string& flags, + const std::string& rawFlag); ///! Get the include flags for the current makefile and language std::string GetIncludeFlags(const std::vector<std::string> &includes, cmGeneratorTarget* target, @@ -285,14 +286,14 @@ public: system to replace make variable references. Optionally adjust escapes for the special case of passing to the native echo command. */ - std::string EscapeForShell(const char* str, bool makeVars = false, + std::string EscapeForShell(const std::string& str, bool makeVars = false, bool forEcho = false); /** Backwards-compatibility version of EscapeForShell. */ - std::string EscapeForShellOldStyle(const char* str); + std::string EscapeForShellOldStyle(const std::string& str); /** Escape the given string as an argument in a CMake script. */ - static std::string EscapeForCMake(const char* str); + static std::string EscapeForCMake(const std::string& str); enum FortranFormat { |