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 2f6589ebc298f1eca198dd6b18b9657e7cd2646f (commit)
via 618e67b60fe3bb559aa40b628eed225c4f4b9d39 (commit)
via 62b90453d701d655cc53b0cda4c9d3d800fefa26 (commit)
from 31cd2c0af0a2cc0c891bdfa9b673d263685cac7c (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=2f6589ebc298f1eca198dd6b18b9657e7cd2646f
commit 2f6589ebc298f1eca198dd6b18b9657e7cd2646f
Merge: 31cd2c0 618e67b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 08:10:04 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 11 08:10:04 2013 -0500
Merge topic 'minor-cleanup' into next
618e67b Avoid certain actions on IMPORTED targets.
62b9045 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=618e67b60fe3bb559aa40b628eed225c4f4b9d39
commit 618e67b60fe3bb559aa40b628eed225c4f4b9d39
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Nov 29 13:18:24 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Dec 11 14:07:55 2013 +0100
Avoid certain actions on IMPORTED targets.
As we're iterating over IMPORTED targets now, handle them in
the loop body. The existing behavior is harmless because generally
nothing is done anyway for IMPORTED targets in these code paths,
because they do not have sources for example.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e6f3d94..83281ce 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1379,6 +1379,10 @@ void cmGlobalGenerator::ComputeGeneratorTargetObjects()
for(cmGeneratorTargetsType::iterator ti = targets.begin();
ti != targets.end(); ++ti)
{
+ if (ti->second->Target->IsImported())
+ {
+ continue;
+ }
cmGeneratorTarget* gt = ti->second;
gt->ClassifySources();
gt->LookupObjectLibraries();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c3c5299..5892105 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -261,6 +261,10 @@ void cmLocalGenerator::TraceDependencies()
for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t)
{
+ if (ti->second->Target->IsImported())
+ {
+ continue;
+ }
t->second->TraceDependencies();
}
}
@@ -545,6 +549,10 @@ void cmLocalGenerator::GenerateTargetManifest()
{
continue;
}
+ if (target->Target->IsImported())
+ {
+ continue;
+ }
if(configNames.empty())
{
target.GenerateTargetManifest(0);
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmGlobalGenerator.cxx | 4 ++++
Source/cmLocalGenerator.cxx | 8 ++++++++
3 files changed, 13 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
