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

COMP: Fix VS6 and old HP build. This source does not have the #define for hack.

Browse Source
This commit is contained in:
Brad King 2008-01-21 08:01:04 -05:00
parent b1151a6487
commit 9198a92af9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/kwsys/SystemTools.cxx
View File

@ -2107,12 +2107,15 @@ kwsys_stl::string SystemTools
SystemTools::GetPath(path); SystemTools::GetPath(path);
} }
// now add the additional paths // now add the additional paths
{
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin(); for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i) i != userPaths.end(); ++i)
{ {
path.push_back(*i); path.push_back(*i);
} }
}
// Add a trailing slash to all paths to aid the search process. // Add a trailing slash to all paths to aid the search process.
{
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i) i != path.end(); ++i)
{ {
@ -2122,6 +2125,7 @@ kwsys_stl::string SystemTools
p += "/"; p += "/";
} }
} }
}
// now look for the file // now look for the file
kwsys_stl::string tryPath; kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
@ -2239,12 +2243,15 @@ kwsys_stl::string SystemTools::FindProgram(
SystemTools::GetPath(path); SystemTools::GetPath(path);
} }
// now add the additional paths // now add the additional paths
{
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i =
userPaths.begin(); i != userPaths.end(); ++i) userPaths.begin(); i != userPaths.end(); ++i)
{ {
path.push_back(*i); path.push_back(*i);
} }
}
// Add a trailing slash to all paths to aid the search process. // Add a trailing slash to all paths to aid the search process.
{
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i) i != path.end(); ++i)
{ {
@ -2254,6 +2261,7 @@ kwsys_stl::string SystemTools::FindProgram(
p += "/"; p += "/";
} }
} }
}
// Try each path // Try each path
for(kwsys_stl::vector<kwsys_stl::string>::iterator p = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::iterator p = path.begin();
p != path.end(); ++p) p != path.end(); ++p)
@ -2331,12 +2339,15 @@ kwsys_stl::string SystemTools
kwsys_stl::vector<kwsys_stl::string> path; kwsys_stl::vector<kwsys_stl::string> path;
SystemTools::GetPath(path); SystemTools::GetPath(path);
// now add the additional paths // now add the additional paths
{
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin(); for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i) i != userPaths.end(); ++i)
{ {
path.push_back(*i); path.push_back(*i);
} }
}
// Add a trailing slash to all paths to aid the search process. // Add a trailing slash to all paths to aid the search process.
{
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i) i != path.end(); ++i)
{ {
@ -2346,6 +2357,7 @@ kwsys_stl::string SystemTools
p += "/"; p += "/";
} }
} }
}
kwsys_stl::string tryPath; kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin(); for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
p != path.end(); ++p) p != path.end(); ++p)