mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-22 06:59:01 -06:00
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.
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user