[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7724-g51a0501

[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  51a0501c8ae25b7e4435a639fb4d25d3498e94d7 (commit)
       via  9db9c1fc8b3314b70a243250ea2879c5a0e82799 (commit)
      from  a06c9465cf9c2dcc66a5b07327ecbe24ae667295 (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=51a0501c8ae25b7e4435a639fb4d25d3498e94d7
commit 51a0501c8ae25b7e4435a639fb4d25d3498e94d7
Merge: a06c946 9db9c1f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 14 07:56:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 14 07:56:29 2014 -0500

    Merge topic 'INTERFACE-no-sources' into next
    
    9db9c1fc cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9db9c1fc8b3314b70a243250ea2879c5a0e82799
commit 9db9c1fc8b3314b70a243250ea2879c5a0e82799
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 14 13:43:40 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 14 13:53:14 2014 +0100

    cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.
    
    An an assert to ensure this.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2573c85..175bb0e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -498,11 +498,14 @@ cmTargetTraceDependencies
 
   // Queue all the source files already specified for the target.
   std::vector<cmSourceFile*> sources;
-  this->Target->GetSourceFiles(sources);
-  for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
-      si != sources.end(); ++si)
+  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
-    this->QueueSource(*si);
+    this->Target->GetSourceFiles(sources);
+    for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
+        si != sources.end(); ++si)
+      {
+      this->QueueSource(*si);
+      }
     }
 
   // Queue pre-build, pre-link, and post-build rule dependencies.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61cab1..0c44681 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1468,7 +1468,8 @@ void cmGlobalGenerator::ComputeGeneratorTargetObjects()
     for(cmGeneratorTargetsType::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second->Target->IsImported())
+      if (ti->second->Target->IsImported()
+          || ti->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
         {
         continue;
         }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3e96b69..db34bd8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -551,6 +551,7 @@ bool cmTarget::FindSourceFiles()
 //----------------------------------------------------------------------------
 void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files) const
 {
+  assert(this->GetType() != INTERFACE_LIBRARY);
   files = this->SourceFiles;
 }
 

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |   11 +++++++----
 Source/cmGlobalGenerator.cxx |    3 ++-
 Source/cmTarget.cxx          |    1 +
 3 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake