[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5511-ga5b7212
Stephen Kelly
steveire at gmail.com
Wed Nov 20 10:59:32 EST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a5b7212ae40e1abe397a2e95a3f12b4a14410ea7 (commit)
via 940229c9192de8d4213c8ed17cdc4ba267e596e6 (commit)
from eac613f02cf842245cc1833863b173ca88e5ddc3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5b7212ae40e1abe397a2e95a3f12b4a14410ea7
commit a5b7212ae40e1abe397a2e95a3f12b4a14410ea7
Merge: eac613f 940229c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 10:59:29 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 20 10:59:29 2013 -0500
Merge topic 'use-generator-target' into next
940229c Order cmGeneratorTargets deterministically.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=940229c9192de8d4213c8ed17cdc4ba267e596e6
commit 940229c9192de8d4213c8ed17cdc4ba267e596e6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 16:58:01 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 20 16:58:01 2013 +0100
Order cmGeneratorTargets deterministically.
Use a string as the key in a map, instead of a cmTarget*.
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 676d4ed..2fd77d4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -914,7 +914,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
for (cmGeneratorTargetsType::iterator l = targets.begin();
l != targets.end(); ++l)
{
- if (l->first->IsImported())
+ if (l->second->Target->IsImported())
{
continue;
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 177bc25..5ed3213 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -100,6 +100,6 @@ private:
void operator=(cmGeneratorTarget const&);
};
-typedef std::map<cmTarget*, cmGeneratorTarget*> cmGeneratorTargetsType;
+typedef std::map<std::string, cmGeneratorTarget*> cmGeneratorTargetsType;
#endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 65a7118..bc4ab52 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1341,8 +1341,8 @@ void cmGlobalGenerator::CreateGeneratorTargets()
{
cmTarget* t = &ti->second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t);
- this->GeneratorTargets[t] = gt;
- generatorTargets[t] = gt;
+ this->GeneratorTargets[t->GetName()] = gt;
+ generatorTargets[t->GetName()] = gt;
}
for(std::vector<cmTarget*>::const_iterator
@@ -1350,8 +1350,8 @@ void cmGlobalGenerator::CreateGeneratorTargets()
j != mf->GetOwnedImportedTargets().end(); ++j)
{
cmGeneratorTarget* gt = new cmGeneratorTarget(*j);
- this->GeneratorTargets[*j] = gt;
- generatorTargets[*j] = gt;
+ this->GeneratorTargets[(*j)->GetName()] = gt;
+ generatorTargets[(*j)->GetName()] = gt;
}
mf->SetGeneratorTargets(generatorTargets);
@@ -1424,7 +1424,8 @@ void cmGlobalGenerator::ClearGeneratorMembers()
//----------------------------------------------------------------------------
cmGeneratorTarget* cmGlobalGenerator::GetGeneratorTarget(cmTarget* t) const
{
- cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
+ cmGeneratorTargetsType::const_iterator ti =
+ this->GeneratorTargets.find(t->GetName());
if(ti == this->GeneratorTargets.end())
{
this->CMakeInstance->IssueMessage(
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index cac4eef..6333873 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -820,7 +820,7 @@ cmGlobalUnixMakefileGenerator3
commands.push_back(progCmd.str());
}
progressDir = "Built target ";
- progressDir += t->first->GetName();
+ progressDir += t->second->GetName();
lg->AppendEcho(commands,progressDir.c_str());
}
else
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 63ec576..3871cad 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -744,7 +744,7 @@ void cmLocalGenerator
for(cmGeneratorTargetsType::iterator l = tgts.begin();
l != tgts.end(); l++)
{
- if (l->first->IsImported())
+ if (l->second->Target->IsImported())
{
continue;
}
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 7d7cf0b..158d714 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -68,8 +68,10 @@ void cmLocalNinjaGenerator::Generate()
for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t)
{
- if (t->first->IsImported())
- continue;
+ if (t->second->Target->IsImported())
+ {
+ continue;
+ }
cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second);
if(tg)
{
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 943a866..9af5c29 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -151,8 +151,10 @@ void cmLocalUnixMakefileGenerator3::Generate()
for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t)
{
- if (t->first->IsImported())
- continue;
+ if (t->second->Target->IsImported())
+ {
+ continue;
+ }
cmsys::auto_ptr<cmMakefileTargetGenerator> tg(
cmMakefileTargetGenerator::New(t->second));
if (tg.get())
-----------------------------------------------------------------------
Summary of changes:
Source/cmExtraEclipseCDT4Generator.cxx | 2 +-
Source/cmGeneratorTarget.h | 2 +-
Source/cmGlobalGenerator.cxx | 11 ++++++-----
Source/cmGlobalUnixMakefileGenerator3.cxx | 2 +-
Source/cmLocalGenerator.cxx | 2 +-
Source/cmLocalNinjaGenerator.cxx | 6 ++++--
Source/cmLocalUnixMakefileGenerator3.cxx | 6 ++++--
7 files changed, 18 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list