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 38fa21de726aeab8fc9a0df146a5eea9ff9d04e6 (commit)
via 05ce0bd9dd4de176b2e6149bad0580f4ad77f4d5 (commit)
from b2bffb446bf890ab401bb31c206e5d1b8bcab6f0 (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=38fa21de726aeab8fc9a0df146a5eea9ff9d04e6
commit 38fa21de726aeab8fc9a0df146a5eea9ff9d04e6
Merge: b2bffb4 05ce0bd
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Oct 20 02:28:13 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Oct 20 02:28:13 2012 -0400
Merge topic 'genex-validate-target-property-names' into next
05ce0bd Fix compiler warning.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ce0bd9dd4de176b2e6149bad0580f4ad77f4d5
commit 05ce0bd9dd4de176b2e6149bad0580f4ad77f4d5
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Oct 20 08:27:23 2012 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sat Oct 20 08:27:23 2012 +0200
Fix compiler warning.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 62e2081..27e9857 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1110,12 +1110,12 @@ void cmGlobalGenerator::CreateGeneratorTargets()
}
for(std::vector<cmTarget*>::const_iterator
- i = mf->GetOwnedImportedTargets().begin();
- i != mf->GetOwnedImportedTargets().end(); ++i)
+ j = mf->GetOwnedImportedTargets().begin();
+ j != mf->GetOwnedImportedTargets().end(); ++i)
{
- cmGeneratorTarget* gt = new cmGeneratorTarget(*i);
- this->GeneratorTargets[*i] = gt;
- generatorTargets[*i] = gt;
+ cmGeneratorTarget* gt = new cmGeneratorTarget(*j);
+ this->GeneratorTargets[*j] = gt;
+ generatorTargets[*j] = gt;
}
mf->SetGeneratorTargets(generatorTargets);
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
