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 137dc18dbe0d9e319c0c355f39677fa6639f0863 (commit)
via ec9249e11d1cd7a460d1e14bfb593b0be560f28c (commit)
from c111642e9d01ccca9b41cdbd84b893081c10be47 (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=137dc18dbe0d9e319c0c355f39677fa6639f0863
commit 137dc18dbe0d9e319c0c355f39677fa6639f0863
Merge: c111642 ec9249e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 7 09:49:46 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 7 09:49:46 2014 -0500
Merge topic 'genex-target-objects-ordering' into next
ec9249e1 genex: Add comments explaining map consistency
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec9249e11d1cd7a460d1e14bfb593b0be560f28c
commit ec9249e11d1cd7a460d1e14bfb593b0be560f28c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 7 09:48:56 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 7 09:49:19 2014 -0500
genex: Add comments explaining map consistency
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 9cf3536..67a1a6d 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1289,8 +1289,10 @@ static const struct TargetObjectsNode : public
cmGeneratorExpressionNode
for(std::vector<cmSourceFile const*>::const_iterator it
= objectSources.begin(); it != objectSources.end(); ++it)
{
- std::map<cmSourceFile const*, std::string>::const_iterator map_it;
- map_it = mapping.find(*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;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
