kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION. 

The intention is to move generation-semantic cmTarget API to cmGeneratorTarget
and then use the latter for generator expressions.

This means that each time we read a deprecated LOCATION property, we have to
clear and re-populate the container.  That must be done each time because the
result can change through the configure process, which is why this is
deprecated in the first place.
This commit is contained in:
Stephen Kelly 2015-07-25 21:10:31 +02:00
parent 5ab3a94651
commit ba26685882
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmTarget.cxx
View File

@ -2950,8 +2950,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
} }
else else
{ {
cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
gg->CreateGenerationObjects();
cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
this->Properties.SetProperty( this->Properties.SetProperty(
prop, this->GetFullPath(configName, false).c_str()); prop, gt->Target->GetFullPath(configName, false).c_str());
} }
} }
// Support "<CONFIG>_LOCATION". // Support "<CONFIG>_LOCATION".
@ -2971,8 +2974,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
} }
else else
{ {
cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
gg->CreateGenerationObjects();
cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
this->Properties.SetProperty( this->Properties.SetProperty(
prop, this->GetFullPath(configName, false).c_str()); prop, gt->Target->GetFullPath(configName, false).c_str());
} }
} }
} }