diff options
author | Jiri Malak <malak.jiri@gmail.com> | 2023-01-24 21:12:28 (GMT) |
---|---|---|
committer | Jiri Malak <malak.jiri@gmail.com> | 2023-01-24 21:12:28 (GMT) |
commit | a1d065e5c7f2b0bb33dc8aea6d10947e46a43abb (patch) | |
tree | 4f7dfaaa52b2b0b2f0d49d4200431500fc148025 /Source/cmMakefileLibraryTargetGenerator.cxx | |
parent | 62483b9b99647bcec8275d7b139a64e879623fcc (diff) | |
download | CMake-a1d065e5c7f2b0bb33dc8aea6d10947e46a43abb.zip CMake-a1d065e5c7f2b0bb33dc8aea6d10947e46a43abb.tar.gz CMake-a1d065e5c7f2b0bb33dc8aea6d10947e46a43abb.tar.bz2 |
Watcom: Replace WATCOMQUOTE format by UseWatcomQuote attribute
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
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 45ef8c8..09c9c7e 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -756,12 +756,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( 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.LinkLibraries = linkLibs.c_str(); vars.ObjectsQuoted = buildObjs.c_str(); |