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 541191bf9bf9da11893f4a4e0aef7315db8637ad (commit)
via 55d6c5a91f7261edcc1e62866fa186647f8325f3 (commit)
via 82a256e44096483fd8c09cffc7faf8f519298ff8 (commit)
from 9e18e80a4235f5c8ff453057ff58349a1171fbac (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=541191bf9bf9da11893f4a4e0aef7315db8637ad
commit 541191bf9bf9da11893f4a4e0aef7315db8637ad
Merge: 9e18e80 55d6c5a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jun 8 17:47:49 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 8 17:47:49 2015 -0400
Merge topic 'use-generator-target' into next
55d6c5a9 fixup! cmComputeTargetDepends: Change API to use cmGeneratorTarget.
82a256e4 fixup! GHS: Use a cmGeneratorTarget in generator API.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55d6c5a91f7261edcc1e62866fa186647f8325f3
commit 55d6c5a91f7261edcc1e62866fa186647f8325f3
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jun 8 23:47:28 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jun 8 23:47:28 2015 +0200
fixup! cmComputeTargetDepends: Change API to use cmGeneratorTarget.
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 632141a..65a15ee 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -224,7 +224,7 @@ void cmGlobalVisualStudio6Generator
tt = orderedProjectTargets.begin();
tt != orderedProjectTargets.end(); ++tt)
{
- cmTarget const* target = *tt;
+ cmTarget const* target = (*tt)->Target;
if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index f453da1..1674e98 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -402,7 +402,7 @@ void
cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
for(OrderedTargetDependSet::const_iterator tt =
projectTargets.begin(); tt != projectTargets.end(); ++tt)
{
- cmTarget const* target = *tt;
+ cmTarget const* target = (*tt)->Target;
if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
@@ -442,7 +442,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
for(OrderedTargetDependSet::const_iterator tt =
projectTargets.begin(); tt != projectTargets.end(); ++tt)
{
- cmTarget const* target = *tt;
+ cmTarget const* target = (*tt)->Target;
if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
@@ -534,7 +534,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
for(OrderedTargetDependSet::const_iterator tt =
projectTargets.begin(); tt != projectTargets.end(); ++tt)
{
- cmTarget const* target = *tt;
+ cmTarget const* target = (*tt)->Target;
if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
@@ -1045,12 +1045,12 @@ cmGlobalVisualStudio7Generator
::IsDependedOn(OrderedTargetDependSet const& projectTargets,
cmTarget const* targetIn)
{
+ cmGeneratorTarget* gtIn = this->GetGeneratorTarget(targetIn);
for (OrderedTargetDependSet::const_iterator l = projectTargets.begin();
l != projectTargets.end(); ++l)
{
- cmTarget const& target = **l;
- TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(target);
- if(tgtdeps.count(targetIn))
+ TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(*l);
+ if(tgtdeps.count(gtIn))
{
return true;
}
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index b96a799..f3cf36e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,7 +441,8 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
void cmGlobalVisualStudio8Generator::WriteProjectDepends(
std::ostream& fout, const std::string&, const char*, cmTarget const& t)
{
- TargetDependSet const& unordered = this->GetTargetDirectDepends(t);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
+ TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
OrderedTargetDependSet depends(unordered);
for(OrderedTargetDependSet::const_iterator i = depends.begin();
i != depends.end(); ++i)
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 585d19a..8723956 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -106,7 +106,8 @@ void cmGlobalVisualStudioGenerator::Generate()
for(cmTargets::iterator t = targets.begin();
t != targets.end(); ++t)
{
- if(!this->IsExcluded(gen[0], t->second))
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&t->second);
+ if(!this->IsExcluded(gen[0], gt))
{
allBuild->AddUtility(t->second.GetName());
}
@@ -299,13 +300,14 @@ void
cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
{
if(linked.insert(target).second)
{
- TargetDependSet const& depends = this->GetTargetDirectDepends(*target);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+ TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
for(TargetDependSet::const_iterator di = depends.begin();
di != depends.end(); ++di)
{
if(di->IsLink())
{
- this->FillLinkClosure(*di, linked);
+ this->FillLinkClosure(di->Target, linked);
}
}
}
@@ -320,7 +322,8 @@
cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
{
TargetSetMap::value_type entry(target, TargetSet());
i = this->TargetLinkClosure.insert(entry).first;
- this->FillLinkClosure(target, i->second);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+ this->FillLinkClosure(gt, i->second);
}
return i->second;
}
@@ -338,13 +341,14 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
{
// Static library targets do not list their link dependencies so
// we must follow them transitively now.
- TargetDependSet const& depends = this->GetTargetDirectDepends(*target);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+ TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
for(TargetDependSet::const_iterator di = depends.begin();
di != depends.end(); ++di)
{
if(di->IsLink())
{
- this->FollowLinkDepends(*di, linked);
+ this->FollowLinkDepends(di->Target, linked);
}
}
}
@@ -413,7 +417,8 @@ void
cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
target.GetType() != cmTarget::MODULE_LIBRARY &&
target.GetType() != cmTarget::EXECUTABLE);
- TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+ TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
// Collect implicit link dependencies (target_link_libraries).
// Static libraries cannot depend on their link implementation
@@ -427,7 +432,7 @@ void
cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
cmTargetDepend dep = *di;
if(dep.IsLink())
{
- this->FollowLinkDepends(dep, linkDepends);
+ this->FollowLinkDepends(dep->Target, linkDepends);
}
}
}
@@ -440,7 +445,7 @@ void
cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
cmTargetDepend dep = *di;
if(dep.IsUtil())
{
- this->FollowLinkDepends(dep, utilDepends);
+ this->FollowLinkDepends(dep->Target, utilDepends);
}
}
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 12a1e42..591c2db 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2660,7 +2660,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
void cmVisualStudio10TargetGenerator::WriteProjectReferences()
{
cmGlobalGenerator::TargetDependSet const& unordered
- = this->GlobalGenerator->GetTargetDirectDepends(*this->Target);
+ = this->GlobalGenerator->GetTargetDirectDepends(this->GeneratorTarget);
typedef cmGlobalVisualStudioGenerator::OrderedTargetDependSet
OrderedTargetDependSet;
OrderedTargetDependSet depends(unordered);
@@ -2668,7 +2668,7 @@ void
cmVisualStudio10TargetGenerator::WriteProjectReferences()
for( OrderedTargetDependSet::const_iterator i = depends.begin();
i != depends.end(); ++i)
{
- cmTarget const* dt = *i;
+ cmTarget const* dt = (*i)->Target;
if(dt->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82a256e44096483fd8c09cffc7faf8f519298ff8
commit 82a256e44096483fd8c09cffc7faf8f519298ff8
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jun 8 23:36:13 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jun 8 23:36:13 2015 +0200
fixup! GHS: Use a cmGeneratorTarget in generator API.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index f4c9a83..83b6cff 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -26,7 +26,7 @@
cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
, LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
target->GetLocalGenerator()))
, Makefile(target->Target->GetMakefile())
- , TargetGroup(DetermineIfTargetGroup(target))
+ , TargetGroup(DetermineIfTargetGroup(target->Target))
, DynamicDownload(false)
{
this->RelBuildFilePath = this->GetRelBuildFilePath(target);
-----------------------------------------------------------------------
Summary of changes:
Source/cmGhsMultiTargetGenerator.cxx | 2 +-
Source/cmGlobalVisualStudio6Generator.cxx | 2 +-
Source/cmGlobalVisualStudio7Generator.cxx | 12 ++++++------
Source/cmGlobalVisualStudio8Generator.cxx | 3 ++-
Source/cmGlobalVisualStudioGenerator.cxx | 23 ++++++++++++++---------
Source/cmVisualStudio10TargetGenerator.cxx | 4 ++--
6 files changed, 26 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
