[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-405-gc111642

[Clinton Stimpson]

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  c111642e9d01ccca9b41cdbd84b893081c10be47 (commit)
       via  580b668d275e294f486da1740f8c1891a98923e0 (commit)
      from  b67cd9793939d61318794583811d4539a2c12b4b (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=c111642e9d01ccca9b41cdbd84b893081c10be47
commit c111642e9d01ccca9b41cdbd84b893081c10be47
Merge: b67cd97 580b668
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Nov 6 23:00:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 23:00:36 2014 -0500

    Merge topic 'genex-target-objects-ordering' into next
    
    580b668d genex: Preserve order while evaluating TARGET_OBJECTS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=580b668d275e294f486da1740f8c1891a98923e0
commit 580b668d275e294f486da1740f8c1891a98923e0
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Nov 6 20:56:50 2014 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Nov 6 20:59:07 2014 -0700

    genex: Preserve order while evaluating TARGET_OBJECTS

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index c1478df..9cf3536 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1286,12 +1286,14 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
     std::string obj_dir = gt->ObjectDirectory;
     std::string result;
     const char* sep = "";
-    for(std::map<cmSourceFile const*, std::string>::const_iterator it
-        = mapping.begin(); it != mapping.end(); ++it)
+    for(std::vector<cmSourceFile const*>::const_iterator it
+        = objectSources.begin(); it != objectSources.end(); ++it)
       {
-      assert(!it->second.empty());
+      std::map<cmSourceFile const*, std::string>::const_iterator map_it;
+      map_it = mapping.find(*it);
+      assert(!map_it->second.empty());
       result += sep;
-      std::string objFile = obj_dir + it->second;
+      std::string objFile = obj_dir + map_it->second;
       cmSourceFile* sf = context->Makefile->GetOrCreateSource(objFile, true);
       sf->SetObjectLibrary(tgtName);
       sf->SetProperty("EXTERNAL_OBJECT", "1");

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake