kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: clean up and remove some debug code

This commit is contained in:
Bill Hoffman 2005-02-24 13:26:39 -05:00
parent ff812580eb
commit a51f7b4f9a
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Source/cmOrderLinkDirectories.cxx
View File

@ -3,15 +3,6 @@
#include "cmsys/RegularExpression.hxx" #include "cmsys/RegularExpression.hxx"
inline void printv(std::vector<cmStdString>& v)
{
for(unsigned int i = 0; i < v.size(); ++i)
{
std::cerr << "[" << v[i] << "]" << " ";
}
std::cerr << "\n";
}
//------------------------------------------------------------------- //-------------------------------------------------------------------
bool cmOrderLinkDirectories::LibraryInDirectory(const char* dir, bool cmOrderLinkDirectories::LibraryInDirectory(const char* dir,
@ -81,27 +72,6 @@ void cmOrderLinkDirectories::FindIndividualLibraryOrders()
} }
} }
//-------------------------------------------------------------------
void
cmOrderLinkDirectories::PrintMap(const char* name,
std::map<cmStdString, std::vector<cmStdString> >& m)
{
std::cerr << name << "\n";
for(std::map<cmStdString, std::vector<cmStdString> >::iterator i =
m.begin(); i != m.end();
++i)
{
std::cerr << i->first << ": ";
for(std::vector<cmStdString>::iterator l = i->second.begin();
l != i->second.end(); ++l)
{
std::cerr << *l << " ";
}
std::cerr << "\n";
}
}
//------------------------------------------------------------------- //-------------------------------------------------------------------
void cmOrderLinkDirectories::CreateRegularExpressions() void cmOrderLinkDirectories::CreateRegularExpressions()
{ {
@ -318,10 +288,6 @@ bool cmOrderLinkDirectories::DetermineLibraryPathOrder()
// now turn libfoo.a into foo and foo.a into foo // now turn libfoo.a into foo and foo.a into foo
// This will prepare the link items for -litem // This will prepare the link items for -litem
this->PrepareLinkTargets(); this->PrepareLinkTargets();
// this->PrintMap("m_DirectoryToAfterList", m_DirectoryToAfterList);
//this->PrintMap("m_LibraryToDirectories", m_LibraryToDirectories);
//std::cerr << "link objects: ";
//printv(m_LinkItems);
if(m_ImposibleDirectories.size()) if(m_ImposibleDirectories.size())
{ {
return false; return false;
@ -354,3 +320,24 @@ std::string cmOrderLinkDirectories::GetWarnings()
warning += "\n"; warning += "\n";
return warning; return warning;
} }
//-------------------------------------------------------------------
void
cmOrderLinkDirectories::PrintMap(const char* name,
std::map<cmStdString, std::vector<cmStdString> >& m)
{
std::cerr << name << "\n";
for(std::map<cmStdString, std::vector<cmStdString> >::iterator i =
m.begin(); i != m.end();
++i)
{
std::cerr << i->first << ": ";
for(std::vector<cmStdString>::iterator l = i->second.begin();
l != i->second.end(); ++l)
{
std::cerr << *l << " ";
}
std::cerr << "\n";
}
}