diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:58 (GMT) |
| commit | 0c978063259fb013856b617d680cebcdee51ab1a (patch) | |
| tree | c943813035b6d0a51f7d60d4c4129f4033227eaa /Source/cmMakefileTargetGenerator.cxx | |
| parent | 0152a01f11fc46f645fd765cc7b1be76cc07b52a (diff) | |
| download | CMake-0c978063259fb013856b617d680cebcdee51ab1a.zip CMake-0c978063259fb013856b617d680cebcdee51ab1a.tar.gz CMake-0c978063259fb013856b617d680cebcdee51ab1a.tar.bz2 | |
cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator
Add a cmOutputConverter to the cmLinkLineComputer and factory methods to
facilitate shell escapes.
Add state to the cmLinkLineComputer to record whether outputting for
response files or for watcom, to satisfy the cmOutputConverter API.
These are constant for the lifetime of the cmLinkLineComputer, even when
its functionality is extended in the future. This also keeps the
signatures of cmLinkLineComputer relatively simple.
Pass the cmComputeLinkInformation as a method parameter so that
cmLinkLineComputer is free from target-specific state. An instance
should be usable for all targets in a directory.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index c74b381..d9102a6 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1590,12 +1590,14 @@ std::string cmMakefileTargetGenerator::CreateResponseFile( } cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer( - cmState::Directory stateDir) + cmOutputConverter* outputConverter, cmState::Directory stateDir) { if (this->Makefile->IsOn("MSVC60")) { - return this->GlobalGenerator->CreateMSVC60LinkLineComputer(stateDir); + return this->GlobalGenerator->CreateMSVC60LinkLineComputer(outputConverter, + stateDir); } - return this->GlobalGenerator->CreateLinkLineComputer(stateDir); + return this->GlobalGenerator->CreateLinkLineComputer(outputConverter, + stateDir); } void cmMakefileTargetGenerator::CreateLinkLibs( |