summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-08-29 17:22:41 (GMT)
committerBrad King <brad.king@kitware.com>2008-08-29 17:22:41 (GMT)
commit56713fbab90540a7db0ee08929be863da7c379df (patch)
tree96f3bcc5de6962d68801f604892b7959c428c678
parentba7fff0161503bce26f653eab766630395bebbca (diff)
downloadCMake-56713fbab90540a7db0ee08929be863da7c379df.zip
CMake-56713fbab90540a7db0ee08929be863da7c379df.tar.gz
CMake-56713fbab90540a7db0ee08929be863da7c379df.tar.bz2
BUG: Link flags should still be chained
The recent fix to avoid including flags in dependency inferral also dropped them from chaining of dependencies through targets. This fix restores chaining of flags through known dependency lists while still leaving them out of inferred dependency lists.
-rw-r--r--Source/cmComputeLinkDepends.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index e19935b..cc60e09 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -576,10 +576,7 @@ cmComputeLinkDepends::AddLinkEntries(int depender_index,
// The dependee must come after the depender.
if(depender_index >= 0)
{
- if(!this->EntryList[dependee_index].IsFlag)
- {
- this->EntryConstraintGraph[depender_index].push_back(dependee_index);
- }
+ this->EntryConstraintGraph[depender_index].push_back(dependee_index);
}
else
{