mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGeneratorTarget: Factor out a GetTargetObjectNames method

Browse Source
This commit is contained in:
Brad King
2017-04-11 14:42:39 -04:00
parent 3ab4681efa
commit 930042f2d9
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Source/cmGeneratorExpressionNode.cxx
View File

@@ -33,8 +33,6 @@
#include <string.h>
#include <utility>
class cmSourceFile;
std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
std::string const& prop, cmLocalGenerator* lg,
cmGeneratorExpressionContext* context, cmGeneratorTarget const* headTarget,
@@ -1254,38 +1252,22 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
return std::string();
}
std::vector<cmSourceFile const*> objectSources;
gt->GetObjectSources(objectSources, context->Config);
std::map<cmSourceFile const*, std::string> mapping;
std::vector<std::string> objects;
gt->GetTargetObjectNames(context->Config, objects);
for (std::vector<cmSourceFile const*>::const_iterator it =
objectSources.begin();
it != objectSources.end(); ++it) {
mapping[*it];
for (std::vector<std::string>::iterator oi = objects.begin();
oi != objects.end(); ++oi) {
*oi = gt->ObjectDirectory + *oi;
}
gt->LocalGenerator->ComputeObjectFilenames(mapping, gt);
// Create the cmSourceFile instances in the referencing directory.
cmMakefile* mf = context->LG->GetMakefile();
std::string obj_dir = gt->ObjectDirectory;
std::string result;
const char* sep = "";
for (std::vector<cmSourceFile const*>::const_iterator it =
objectSources.begin();
it != objectSources.end(); ++it) {
// Find the object file name corresponding to this source file.
std::map<cmSourceFile const*, std::string>::const_iterator map_it =
mapping.find(*it);
// It must exist because we populated the mapping just above.
assert(!map_it->second.empty());
result += sep;
std::string objFile = obj_dir + map_it->second;
mf->AddTargetObject(tgtName, objFile);
result += objFile;
sep = ";";
for (std::vector<std::string>::iterator oi = objects.begin();
oi != objects.end(); ++oi) {
mf->AddTargetObject(tgtName, *oi);
}
return result;
return cmJoin(objects, ";");
}
} targetObjectsNode;

27
Source/cmGeneratorTarget.cxx
View File

@@ -3254,6 +3254,33 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
return prefix + base + ".pdb";
}
void cmGeneratorTarget::GetTargetObjectNames(
std::string const& config, std::vector<std::string>& objects) const
{
std::vector<cmSourceFile const*> objectSources;
this->GetObjectSources(objectSources, config);
std::map<cmSourceFile const*, std::string> mapping;
for (std::vector<cmSourceFile const*>::const_iterator it =
objectSources.begin();
it != objectSources.end(); ++it) {
mapping[*it];
}
this->LocalGenerator->ComputeObjectFilenames(mapping, this);
for (std::vector<cmSourceFile const*>::const_iterator it =
objectSources.begin();
it != objectSources.end(); ++it) {
// Find the object file name corresponding to this source file.
std::map<cmSourceFile const*, std::string>::const_iterator map_it =
mapping.find(*it);
// It must exist because we populated the mapping just above.
assert(!map_it->second.empty());
objects.push_back(map_it->second);
}
}
bool cmGeneratorTarget::StrictTargetComparison::operator()(
cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const
{

5
Source/cmGeneratorTarget.h
View File

@@ -209,6 +209,11 @@ public:
bool realname) const;
std::string NormalGetRealName(const std::string& config) const;
/** Get the names of an object library's object files underneath
its object file directory. */
void GetTargetObjectNames(std::string const& config,
std::vector<std::string>& objects) const;
/** What hierarchy level should the reported directory contain */
enum BundleDirectoryLevel
{