diff options
author | Jiri Malak <malak.jiri@gmail.com> | 2014-04-04 21:06:13 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-04-08 17:28:54 (GMT) |
commit | cb9b1e13e4de88deb1d675ee26859615c393e9c5 (patch) | |
tree | 05bea6450b10c2aab9067c1062cb55afcebe9629 /Source/cmLocalGenerator.h | |
parent | 9b1abc543e9aee946e093229e1715c4b8a961514 (diff) | |
download | CMake-cb9b1e13e4de88deb1d675ee26859615c393e9c5.zip CMake-cb9b1e13e4de88deb1d675ee26859615c393e9c5.tar.gz CMake-cb9b1e13e4de88deb1d675ee26859615c393e9c5.tar.bz2 |
Watcom: Use single quote for all file/path items in wlink command
Watcom Linker use single quote if necessary for quoting target name,
libraries names and libraries search path. Object names were already
fixed.
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 8f30149..8090b34 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -106,7 +106,7 @@ public: * path setting */ enum RelativeRoot { NONE, FULL, HOME, START, HOME_OUTPUT, START_OUTPUT }; - enum OutputFormat { UNCHANGED, MAKEFILE, SHELL, RESPONSE }; + enum OutputFormat { UNCHANGED, MAKEFILE, SHELL, WATCOMQUOTE, RESPONSE }; std::string ConvertToOutputFormat(const std::string& source, OutputFormat output); std::string Convert(const std::string& remote, RelativeRoot local, @@ -288,7 +288,8 @@ public: escapes for the special case of passing to the native echo command. */ std::string EscapeForShell(const std::string& str, bool makeVars = false, - bool forEcho = false); + bool forEcho = false, + bool useWatcomQuote = false); /** Backwards-compatibility version of EscapeForShell. */ std::string EscapeForShellOldStyle(const std::string& str); @@ -370,7 +371,8 @@ public: std::string& linkFlags, std::string& frameworkPath, std::string& linkPath, - cmGeneratorTarget* target); + cmGeneratorTarget* target, + bool useWatcomQuote); virtual void ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, @@ -383,7 +385,8 @@ protected: std::string& linkPath, cmGeneratorTarget &, bool relink, - bool forResponseFile); + bool forResponseFile, + bool useWatcomQuote); // Expand rule variables in CMake of the type found in language rules void ExpandRuleVariables(std::string& string, |