summaryrefslogtreecommitdiffstats
path: root/Source/cmCustomCommandGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-25 19:28:36 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-07-27 19:58:50 (GMT)
commitc7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e (patch)
tree6628b5e991d2d35f1776f12b6ae427e2bd222792 /Source/cmCustomCommandGenerator.cxx
parent5b60eaf619baf4dfa2bc1a3f1109ff742a04f532 (diff)
downloadCMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.zip
CMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.tar.gz
CMake-c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e.tar.bz2
Always access target location from a cmGeneratorTarget instance.
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
-rw-r--r--Source/cmCustomCommandGenerator.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 8483a91..086c9f9 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -42,12 +42,13 @@ unsigned int cmCustomCommandGenerator::GetNumberOfCommands() const
std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
{
std::string const& argv0 = this->CC.GetCommandLines()[c][0];
- cmTarget* target = this->LG->GetMakefile()->FindTargetToUse(argv0);
+ cmGeneratorTarget* target =
+ this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
if(target && target->GetType() == cmTarget::EXECUTABLE &&
- (target->IsImported()
+ (target->Target->IsImported()
|| !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
{
- return target->GetLocation(this->Config);
+ return target->Target->GetLocation(this->Config);
}
return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(),
this->Config);