summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkDepends.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-04-06 15:10:37 (GMT)
committerBrad King <brad.king@kitware.com>2009-04-06 15:10:37 (GMT)
commit85bffd3eeb7ae6b3ae35a5da381aa55edff0b4be (patch)
tree319aca70ef7a1198098868b79b2db8d327bb7a93 /Source/cmComputeLinkDepends.h
parentc9949f97a7b732eb703dd85800c4c607bd9229da (diff)
downloadCMake-85bffd3eeb7ae6b3ae35a5da381aa55edff0b4be.zip
CMake-85bffd3eeb7ae6b3ae35a5da381aa55edff0b4be.tar.gz
CMake-85bffd3eeb7ae6b3ae35a5da381aa55edff0b4be.tar.bz2
BUG: Lookup transitive link deps in depender scope
The transitive link dependencies of a linked target must be followed in its own scope, not in the scope of the original target that depends on it. This is necessary since imported targets do not have global scope. See issue #8843.
Diffstat (limited to 'Source/cmComputeLinkDepends.h')
-rw-r--r--Source/cmComputeLinkDepends.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 47fa648..fdca2b5 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -81,14 +81,14 @@ private:
std::map<cmStdString, int>::iterator
AllocateLinkEntry(std::string const& item);
- int AddLinkEntry(std::string const& item);
+ int AddLinkEntry(int depender_index, std::string const& item);
void AddVarLinkEntries(int depender_index, const char* value);
void AddTargetLinkEntries(int depender_index,
LinkLibraryVectorType const& libs);
void AddLinkEntries(int depender_index,
std::vector<std::string> const& libs);
std::string CleanItemName(std::string const& item);
- cmTarget* FindTargetToLink(const char* name);
+ cmTarget* FindTargetToLink(int depender_index, const char* name);
// One entry for each unique item.
std::vector<LinkEntry> EntryList;
@@ -162,7 +162,7 @@ private:
// Compatibility help.
bool OldLinkDirMode;
- void CheckWrongConfigItem(std::string const& item);
+ void CheckWrongConfigItem(int depender_index, std::string const& item);
std::set<cmTarget*> OldWrongConfigItems;
};