diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-23 20:56:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-23 20:56:17 (GMT) |
| commit | 48fddd602da3df44554b20ba134c811010af5dc4 (patch) | |
| tree | b9ebc5fed679d99d41f818681f7c0944d9f8be4c /Source/cmComputeLinkInformation.h | |
| parent | f27379e3f7291abd0c7f3706cd9e1202052c9889 (diff) | |
| download | CMake-48fddd602da3df44554b20ba134c811010af5dc4.zip CMake-48fddd602da3df44554b20ba134c811010af5dc4.tar.gz CMake-48fddd602da3df44554b20ba134c811010af5dc4.tar.bz2 | |
BUG: Fix cmComputeLinkInformation cycle detection.
Diffstat (limited to 'Source/cmComputeLinkInformation.h')
| -rw-r--r-- | Source/cmComputeLinkInformation.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 9f86c7d..65a870a 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -146,7 +146,7 @@ private: std::set<cmStdString> LibraryRuntimeInfoEmmitted; std::vector<std::string> RuntimeDirectories; std::map<cmStdString, int> RuntimeDirectoryIndex; - std::vector<char> RuntimeDirectoryVisited; + std::vector<int> RuntimeDirectoryVisited; void AddLibraryRuntimeInfo(std::string const& fullPath, cmTarget* target); void AddLibraryRuntimeInfo(std::string const& fullPath, const char* soname = 0); @@ -155,9 +155,10 @@ private: void FindConflictingLibraries(); void FindDirectoriesForLib(unsigned int lri); void OrderRuntimeSearchPath(); - void VisitRuntimeDirectory(unsigned int i, bool top); + void VisitRuntimeDirectory(unsigned int i); void DiagnoseCycle(); bool CycleDiagnosed; + int WalkId; // Adjacency-list representation of runtime path ordering graph. // This maps from directory to those that must come *before* it. |