diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-01 15:06:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-01 15:06:08 (GMT) |
| commit | 382c9ee85948e8e7291e5414ce37967e08c56fe2 (patch) | |
| tree | 4e4e669a82ea92accf5ef20595c80f9883a6fbc4 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 09498984b13ef2a61992dda0afacd3b050049f88 (diff) | |
| parent | 423009c17f50f837bca178a2cc5edfd62963f1ea (diff) | |
| download | CMake-382c9ee85948e8e7291e5414ce37967e08c56fe2.zip CMake-382c9ee85948e8e7291e5414ce37967e08c56fe2.tar.gz CMake-382c9ee85948e8e7291e5414ce37967e08c56fe2.tar.bz2 | |
Merge topic 'link-line-quoting'
423009c1 Makefile: Generate single-quoted object lists for Watcom
a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 02469d1..754f62f 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -458,6 +458,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules this->Target); } + bool useWatcomQuote = this->Makefile->IsOn(linkRuleVar+"_USE_WATCOM_QUOTE"); + // Determine whether a link script will be used. bool useLinkScript = this->GlobalGenerator->GetUseLinkScript(); @@ -553,7 +555,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules // rule. std::string buildObjs; this->CreateObjectLists(useLinkScript, useArchiveRules, - useResponseFileForObjects, buildObjs, depends); + useResponseFileForObjects, buildObjs, depends, + useWatcomQuote); cmLocalGenerator::RuleVariables vars; vars.TargetPDB = targetOutPathPDB.c_str(); |