summaryrefslogtreecommitdiffstats
path: root/Source/cmOrderLinkDirectories.h
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-04-04 15:52:00 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-04-04 15:52:00 (GMT)
commitb45f4a5d450c4fd56fd564fe67be00c7aeb4b59a (patch)
tree652b5f33767fc80b8571ca2a91f028a916f0af00 /Source/cmOrderLinkDirectories.h
parent2301a025ea1ed9a61cf0028f88b32f726162fbf7 (diff)
downloadCMake-b45f4a5d450c4fd56fd564fe67be00c7aeb4b59a.zip
CMake-b45f4a5d450c4fd56fd564fe67be00c7aeb4b59a.tar.gz
CMake-b45f4a5d450c4fd56fd564fe67be00c7aeb4b59a.tar.bz2
ENH: change library order to use a vector
Diffstat (limited to 'Source/cmOrderLinkDirectories.h')
-rw-r--r--Source/cmOrderLinkDirectories.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmOrderLinkDirectories.h b/Source/cmOrderLinkDirectories.h
index a7e1b2a..f5aca3d 100644
--- a/Source/cmOrderLinkDirectories.h
+++ b/Source/cmOrderLinkDirectories.h
@@ -108,6 +108,9 @@ private:
void FindIndividualLibraryOrders();
void PrintMap(const char* name,
std::map<cmStdString, std::vector<cmStdString> >& m);
+ void PrintVector(const char* name,
+ std::vector<std::pair<cmStdString,
+ std::vector<cmStdString> > >& m);
void OrderPaths(std::vector<cmStdString>& paths);
bool FindPathNotInDirectoryToAfterList(cmStdString& path);
std::string NoCaseExpression(const char* str);
@@ -115,7 +118,8 @@ private:
// map from library to directories that it is in other than its full path
std::map<cmStdString, std::vector<cmStdString> > LibraryToDirectories;
// map from directory to vector of directories that must be after it
- std::map<cmStdString, std::vector<cmStdString> > DirectoryToAfterList;
+ std::vector<std::pair<cmStdString, std::vector<cmStdString> > > DirectoryToAfterList;
+ std::set<cmStdString> DirectoryToAfterListEmitted;
// map from full path to a Library struct
std::map<cmStdString, Library> FullPathLibraries;
// libraries that are found in multiple directories