diff options
author | Jiri Malak <malak.jiri@gmail.com> | 2014-03-25 07:17:45 +0100 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-27 13:45:29 -0400 |
commit | 423009c17f50f837bca178a2cc5edfd62963f1ea (patch) | |
tree | 152751e8bd297948ac33517d2c8fc89e45e179df /Source/cmLocalUnixMakefileGenerator3.h | |
parent | a863a8fecd368f3b17930dd7832fb2e0ba042616 (diff) | |
download | cmake-423009c17f50f837bca178a2cc5edfd62963f1ea.tar.gz |
Makefile: Generate single-quoted object lists for Watcom
Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile
generators. The underlying problem is with the Watcom linker, not with
WMake. The Watcom linker wants object files to be single-quoted. Add
<LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the
generators to use Watcom-style single quotes for object files on link
lines.
On Windows, Watcom uses the GetCommandLine API to get the original
command-line string and do custom parsing that expects single quotes.
On POSIX systems, Watcom approximates the original command line by
joining all argv[] entries separated by a single space. Therefore we
need to double-quote the single-quoted arguments so that the shell does
not consume them and they are available for the parser to see.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 14543fbaa7..99974eef72 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -186,7 +186,8 @@ public: const char *targetDir, cmLocalGenerator::RelativeRoot returnDir); - static std::string ConvertToQuotedOutputPath(const char* p); + static std::string ConvertToQuotedOutputPath(const char* p, + bool useWatcomQuote); std::string CreateMakeVariable(const std::string& sin, const std::string& s2in); |