diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-25 19:28:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-27 19:58:50 (GMT) |
| commit | c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e (patch) | |
| tree | 6628b5e991d2d35f1776f12b6ae427e2bd222792 /Source/cmLocalGenerator.cxx | |
| parent | 5b60eaf619baf4dfa2bc1a3f1109ff742a04f532 (diff) | |
| download | CMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.zip CMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.tar.gz CMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.tar.bz2 | |
Always access target location from a cmGeneratorTarget instance.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 91e37c4..d6c8bae 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1699,7 +1699,8 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName, } // Look for a CMake target with the given name. - if(cmTarget* target = this->Makefile->FindTargetToUse(name)) + if(cmGeneratorTarget* target = + this->Makefile->FindGeneratorTargetToUse(name)) { // make sure it is not just a coincidence that the target name // found is part of the inName @@ -1709,7 +1710,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName, if(target->GetType() >= cmTarget::EXECUTABLE && target->GetType() <= cmTarget::MODULE_LIBRARY) { - tLocation = target->GetLocation(config); + tLocation = target->Target->GetLocation(config); tLocation = cmSystemTools::GetFilenamePath(tLocation); tLocation = cmSystemTools::CollapseFullPath(tLocation); } @@ -1732,7 +1733,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName, case cmTarget::SHARED_LIBRARY: case cmTarget::MODULE_LIBRARY: case cmTarget::UNKNOWN_LIBRARY: - dep = target->GetLocation(config); + dep = target->Target->GetLocation(config); return true; case cmTarget::OBJECT_LIBRARY: // An object library has no single file on which to depend. |