[cmake-commits] king committed SystemTools.cxx 1.221 1.222
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 21 08:01:06 EST 2008
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv27458
Modified Files:
SystemTools.cxx
Log Message:
COMP: Fix VS6 and old HP build. This source does not have the #define for hack.
Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- SystemTools.cxx 21 Jan 2008 00:29:12 -0000 1.221
+++ SystemTools.cxx 21 Jan 2008 13:01:04 -0000 1.222
@@ -2107,12 +2107,15 @@
SystemTools::GetPath(path);
}
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2122,6 +2125,7 @@
p += "/";
}
}
+ }
// now look for the file
kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
@@ -2239,12 +2243,15 @@
SystemTools::GetPath(path);
}
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i =
userPaths.begin(); i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2254,6 +2261,7 @@
p += "/";
}
}
+ }
// Try each path
for(kwsys_stl::vector<kwsys_stl::string>::iterator p = path.begin();
p != path.end(); ++p)
@@ -2331,12 +2339,15 @@
kwsys_stl::vector<kwsys_stl::string> path;
SystemTools::GetPath(path);
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2346,6 +2357,7 @@
p += "/";
}
}
+ }
kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
p != path.end(); ++p)
More information about the Cmake-commits
mailing list