[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1083-g062a2ec

[Stephen Kelly]

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  062a2ec850b4461afd6ca974c410da0714bdf7c5 (commit)
       via  bee610e2395612e0cee8be17227e027705c3b85f (commit)
      from  ff136d969cf3c6ae655fc90f42e3f8d19c0c8e0e (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=062a2ec850b4461afd6ca974c410da0714bdf7c5
commit 062a2ec850b4461afd6ca974c410da0714bdf7c5
Merge: ff136d9 bee610e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 05:31:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 05:31:34 2014 -0400

    Merge topic 'target-objects-refactor' into next
    
    bee610e2 Xcode: call ComputeObjectMapping


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bee610e2395612e0cee8be17227e027705c3b85f
commit bee610e2395612e0cee8be17227e027705c3b85f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 10:27:29 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 15 10:27:29 2014 +0100

    Xcode: call ComputeObjectMapping

diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 22735c6..91d604d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -46,6 +46,8 @@ public:
   void GetCustomCommands(std::vector<cmSourceFile const*>&) const;
   void GetExpectedResxHeaders(std::set<std::string>&) const;
 
+  void ComputeObjectMapping();
+
   cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalGenerator* LocalGenerator;
@@ -124,8 +126,6 @@ private:
   typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType;
   SourceEntriesType SourceEntries;
 
-  void ComputeObjectMapping();
-
   mutable std::map<cmSourceFile const*, std::string> Objects;
   std::set<cmSourceFile const*> ExplicitObjectName;
   std::vector<cmTarget*> ObjectLibraries;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d4eb85b..287c28f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -988,6 +988,8 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     cmtarget.GetSourceFiles(classes);
     std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
 
+    gtgt->ComputeObjectMapping();
+
     std::vector<cmXCodeObject*> externalObjFiles;
     std::vector<cmXCodeObject*> headerFiles;
     std::vector<cmXCodeObject*> resourceFiles;

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

Summary of changes:
 Source/cmGeneratorTarget.h        |    4 ++--
 Source/cmGlobalXCodeGenerator.cxx |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake