summaryrefslogtreecommitdiffstats
path: root/Source/cmOrderLinkDirectories.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-02-24 18:26:39 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-02-24 18:26:39 (GMT)
commita51f7b4f9afe8f39dc3a12c4872dc1dffe1c502a (patch)
tree8599a9b7a3a379c48fbc200fd70d6c633d33dc95 /Source/cmOrderLinkDirectories.cxx
parentff812580ebec0b7ff908feeb256ad263bfc0c41a (diff)
downloadCMake-a51f7b4f9afe8f39dc3a12c4872dc1dffe1c502a.zip
CMake-a51f7b4f9afe8f39dc3a12c4872dc1dffe1c502a.tar.gz
CMake-a51f7b4f9afe8f39dc3a12c4872dc1dffe1c502a.tar.bz2
ENH: clean up and remove some debug code
Diffstat (limited to 'Source/cmOrderLinkDirectories.cxx')
-rw-r--r--Source/cmOrderLinkDirectories.cxx55
1 files changed, 21 insertions, 34 deletions
diff --git a/Source/cmOrderLinkDirectories.cxx b/Source/cmOrderLinkDirectories.cxx
index 7697aaa..d11853e 100644
--- a/Source/cmOrderLinkDirectories.cxx
+++ b/Source/cmOrderLinkDirectories.cxx
@@ -3,15 +3,6 @@
#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,
@@ -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()
{
@@ -318,10 +288,6 @@ bool cmOrderLinkDirectories::DetermineLibraryPathOrder()
// now turn libfoo.a into foo and foo.a into foo
// This will prepare the link items for -litem
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())
{
return false;
@@ -354,3 +320,24 @@ std::string cmOrderLinkDirectories::GetWarnings()
warning += "\n";
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";
+ }
+}
+