[Cmake-commits] CMake branch, next, updated. v2.8.12-4616-g1faa535

[Brad King]

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  1faa535cda0440ca9d527b935795c04399caf3fb (commit)
       via  d0364898113302ce71cd0af957e0196ff9177992 (commit)
      from  c09cd0394e5c009f5ac9b6849747dabde8e7a1ee (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=1faa535cda0440ca9d527b935795c04399caf3fb
commit 1faa535cda0440ca9d527b935795c04399caf3fb
Merge: c09cd03 d036489
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 29 09:26:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 29 09:26:45 2013 -0400

    Merge topic 'use-generator-target' into next
    
    d036489 Update cmTarget SourceEntries while tracing dependencies

diff --cc Source/cmTarget.cxx
index 0be587c,71ce5b2..698115e
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -153,10 -150,9 +153,10 @@@ public
    std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone;
    std::map<std::string, bool> CacheLinkInterfaceCompileDefinitionsDone;
    std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone;
 +  std::map<std::string, bool> CacheLinkInterfaceCompilerFeaturesDone;
  };
  
- cmTarget::SourceEntriesType cmTarget::GetSourceEntries() const
+ cmTarget::SourceEntriesType& cmTarget::GetSourceEntries() const
  {
    return this->Internal.Get()->SourceEntries;
  }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0364898113302ce71cd0af957e0196ff9177992
commit d0364898113302ce71cd0af957e0196ff9177992
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 29 09:21:25 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 29 09:22:21 2013 -0400

    Update cmTarget SourceEntries while tracing dependencies
    
    Do not make a copy in cmGeneratorTarget and update that one.
    We must update the original so that cmTarget::GetSourceDepends
    returns the proper information after tracing dependencies.
    This is needed for the VS 10 generator (but not VS >= 11) to
    mark external objects as <None> instead of <Object> if they
    are also the output of a custom command in the same target.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eabe381..ef7e5ab 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -282,7 +282,6 @@ private:
   cmMakefile* Makefile;
   cmGlobalGenerator* GlobalGenerator;
   typedef cmTarget::SourceEntry SourceEntry;
-  cmTarget::SourceEntriesType SourceEntries;
   SourceEntry* CurrentEntry;
   std::queue<cmSourceFile*> SourceQueue;
   std::set<cmSourceFile*> SourcesQueued;
@@ -307,7 +306,6 @@ cmTargetTraceDependencies
   this->GlobalGenerator =
     this->Makefile->GetLocalGenerator()->GetGlobalGenerator();
   this->CurrentEntry = 0;
-  this->SourceEntries = this->Target->GetSourceEntries();
 
   // Queue all the source files already specified for the target.
   std::vector<cmSourceFile*> const& sources = this->Target->GetSourceFiles();
@@ -332,7 +330,7 @@ void cmTargetTraceDependencies::Trace()
     // Get the next source from the queue.
     cmSourceFile* sf = this->SourceQueue.front();
     this->SourceQueue.pop();
-    this->CurrentEntry = &this->SourceEntries[sf];
+    this->CurrentEntry = &this->Target->GetSourceEntries()[sf];
 
     // Queue dependencies added explicitly by the user.
     if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS"))
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b5730bc..71ce5b2 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -152,7 +152,7 @@ public:
   std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone;
 };
 
-cmTarget::SourceEntriesType cmTarget::GetSourceEntries() const
+cmTarget::SourceEntriesType& cmTarget::GetSourceEntries() const
 {
   return this->Internal.Get()->SourceEntries;
 }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 99ef0c4..bb73bdc 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -657,7 +657,7 @@ private:
                                        const char* config,
                                        bool contentOnly);
 
-  SourceEntriesType GetSourceEntries() const;
+  SourceEntriesType& GetSourceEntries() const;
 
 private:
   std::string Name;

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

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


hooks/post-receive
-- 
CMake