mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

exports: move the handling of missing targets into subclasses

Browse Source 
Before, cmExportFileGenerator::ComplainAboutMissingTarget() was a virtual
function which had to be implemented in the subclasses. It is not
anymore. Instead, there is now a virtual function
HandleMissingTargets(), which is implemented in the two subclasses.
This makes e.g. dealing correctly with APPEND mode easier.

Alex
This commit is contained in:
Alex Neundorf
2012-09-28 21:47:37 +02:00
committed by Brad King
parent 190f2c8253
commit 0cfd055acd
6 changed files with 124 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmExportFileGenerator.cxx
+1 -65
View File
@@ -233,30 +233,7 @@ cmExportFileGenerator
}
else
{
std::vector<std::string> namespaces = this->FindNamespaces(mf, *li);
int targetOccurrences = (int)namespaces.size();
if (targetOccurrences == 1)
{
std::string missingTarget = namespaces[0];
missingTarget += *li;
link_libs += missingTarget;
missingTargets.push_back(missingTarget);
}
else
{
// The target is not in the export.
if(!this->AppendMode)
{
// We are not appending, so all exported targets should be
// known here. This is probably user-error.
this->ComplainAboutMissingTarget(target, tgt, targetOccurrences);
}
// Assume the target will be exported by another command.
// Append it with the export namespace.
link_libs += this->Namespace;
link_libs += *li;
}
this->HandleMissingTarget(link_libs, missingTargets, mf, target, tgt);
}
}
else
@@ -273,47 +250,6 @@ cmExportFileGenerator
}
//----------------------------------------------------------------------------
std::vector<std::string> cmExportFileGenerator::FindNamespaces(cmMakefile* mf,
const std::string& name)
{
std::vector<std::string> namespaces;
cmGlobalGenerator* gg = mf->GetLocalGenerator()->GetGlobalGenerator();
const cmExportSetMap& exportSets = gg->GetExportSets();
for(cmExportSetMap::const_iterator expIt = exportSets.begin();
expIt != exportSets.end();
++expIt)
{
const cmExportSet* exportSet = expIt->second;
std::vector<cmTargetExport*> const* targets =
exportSet->GetTargetExports();
bool containsTarget = false;
for(unsigned int i=0; i<targets->size(); i++)
{
if (name == (*targets)[i]->Target->GetName())
{
containsTarget = true;
break;
}
}
if (containsTarget)
{
std::vector<cmInstallExportGenerator const*> const* installs =
exportSet->GetInstallations();
for(unsigned int i=0; i<installs->size(); i++)
{
namespaces.push_back((*installs)[i]->GetNamespace());
}
}
}
return namespaces;
}
//----------------------------------------------------------------------------
void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os,
const char* config)