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 f97d707d546b9e6059a982ba301a9a00b9469ac1 (commit)
via 41e48c45e8069ea551ab8511457fd712f5b3b89b (commit)
from 3755dab985d601d18120c6d4d01e2062c027788c (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=f97d707d546b9e6059a982ba301a9a00b9469ac1
commit f97d707d546b9e6059a982ba301a9a00b9469ac1
Merge: 3755dab 41e48c4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 08:23:56 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 11 08:23:56 2013 -0500
Merge topic 'minor-cleanup' into next
41e48c4 Avoid certain actions on IMPORTED targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41e48c45e8069ea551ab8511457fd712f5b3b89b
commit 41e48c45e8069ea551ab8511457fd712f5b3b89b
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:23:09 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..0845120 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 (t->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:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
