diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-11-05 15:14:02 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-11-21 14:49:37 (GMT) |
| commit | 0bbae6f95f55f23b758780f771bf4dd560ac2c07 (patch) | |
| tree | ea5ad5f7a44a70dd85fa251d71ebfe1938cc00ba /Source/cmMakefileTargetGenerator.cxx | |
| parent | d5cf644ac2e3f035d2d3413dd98aa0d46f9f27eb (diff) | |
| download | CMake-0bbae6f95f55f23b758780f771bf4dd560ac2c07.zip CMake-0bbae6f95f55f23b758780f771bf4dd560ac2c07.tar.gz CMake-0bbae6f95f55f23b758780f771bf4dd560ac2c07.tar.bz2 | |
Revert "Move GetLinkInformation to cmGeneratorTarget"
As we can't move all linking related code from cmTarget, it makes
sense to reverse the move in some cases.
This reverts commit 4f5384e75c6a00d110d3fa3f555a3f6a4f31bb46.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 3d02d6a..2b89c79 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1017,8 +1017,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() << "SET(CMAKE_TARGET_LINKED_INFO_FILES\n"; std::set<cmTarget const*> emitted; const char* cfg = this->LocalGenerator->ConfigurationName.c_str(); - if(cmComputeLinkInformation* cli = - this->GeneratorTarget->GetLinkInformation(cfg)) + if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(cfg)) { cmComputeLinkInformation::ItemVector const& items = cli->GetItems(); for(cmComputeLinkInformation::ItemVector::const_iterator @@ -1594,8 +1593,7 @@ void cmMakefileTargetGenerator // Loop over all library dependencies. const char* cfg = this->LocalGenerator->ConfigurationName.c_str(); - if(cmComputeLinkInformation* cli = - this->GeneratorTarget->GetLinkInformation(cfg)) + if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(cfg)) { std::vector<std::string> const& libDeps = cli->GetDepends(); for(std::vector<std::string>::const_iterator j = libDeps.begin(); |