mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Watcom: Replace WATCOMQUOTE format by UseWatcomQuote attribute

Browse Source 
Replace WATCOMQUOTE output format by UseWatcomQuote attribute to properly handle single quote
This attribute is used globaly only for Watcom linker to handle single-quote separator instead of double-quote
it doesn't mean different output format only change of quoting separator
It is now applied to any output form SHELL/RESPONSE/NINJAMULTI if Watcom linker is used otherwise double-quote is used
This commit is contained in:
Jiri Malak
2023-01-24 22:12:28 +01:00
parent 62483b9b99
commit a1d065e5c7
5 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@@ -537,12 +537,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
this->LocalGenerator->MaybeRelativeToCurBinDir(objectDir),
cmOutputConverter::SHELL);
vars.ObjectDir = objectDir.c_str();
cmOutputConverter::OutputFormat output = (useWatcomQuote)
? cmOutputConverter::WATCOMQUOTE
: cmOutputConverter::SHELL;
std::string target = this->LocalGenerator->ConvertToOutputFormat(
this->LocalGenerator->MaybeRelativeToCurBinDir(targetFullPathReal),
output);
cmOutputConverter::SHELL, useWatcomQuote);
vars.Target = target.c_str();
vars.TargetPDB = targetOutPathPDB.c_str();