summaryrefslogtreecommitdiffstats
path: root/Source/cmExportFileGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-17 11:31:33 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-18 14:29:29 (GMT)
commit381e7afd363d64c72b83e69fd6c6cad5fc3eefb4 (patch)
tree4622b0de4d39a55ec71ca7562f18783137da3087 /Source/cmExportFileGenerator.cxx
parent65911cae4dd5a81f23a59bf9187b95bda3168fe9 (diff)
downloadCMake-381e7afd363d64c72b83e69fd6c6cad5fc3eefb4.zip
CMake-381e7afd363d64c72b83e69fd6c6cad5fc3eefb4.tar.gz
CMake-381e7afd363d64c72b83e69fd6c6cad5fc3eefb4.tar.bz2
cmExportSet: Store a cmGeneratorTarget.
Set the member at compute time from the stored name.
Diffstat (limited to 'Source/cmExportFileGenerator.cxx')
-rw-r--r--Source/cmExportFileGenerator.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6127626..4e8bc86 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -398,11 +398,11 @@ void cmExportFileGenerator::PopulateSourcesInterface(
ImportPropertyMap &properties,
std::vector<std::string> &missingTargets)
{
- cmTarget *target = tei->Target;
+ cmGeneratorTarget* gt = tei->Target;
assert(preprocessRule == cmGeneratorExpression::InstallInterface);
const char *propName = "INTERFACE_SOURCES";
- const char *input = target->GetProperty(propName);
+ const char *input = gt->GetProperty(propName);
if (!input)
{
@@ -420,11 +420,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
true);
if (!prepro.empty())
{
- this->ResolveTargetsInGeneratorExpressions(prepro, target,
+ this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
missingTargets);
- cmGeneratorTarget* gt = target->GetMakefile()
- ->GetGlobalGenerator()->GetGeneratorTarget(target);
if (!checkInterfaceDirs(prepro, gt, propName))
{
return;
@@ -440,9 +438,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
ImportPropertyMap &properties,
std::vector<std::string> &missingTargets)
{
- cmGeneratorTarget *target = tei->Target->GetMakefile()
- ->GetGlobalGenerator()
- ->GetGeneratorTarget(tei->Target);
+ cmGeneratorTarget *target = tei->Target;
assert(preprocessRule == cmGeneratorExpression::InstallInterface);
const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";