diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-21 13:01:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-21 13:01:04 (GMT) |
| commit | 9198a92af9e9f05a90d544c76ffeb65aa1a5281e (patch) | |
| tree | e2f67fa3a6356c7445e616c3a23ef108412737cb /Source/kwsys | |
| parent | b1151a6487269becfc730f956f9c6ead955568a4 (diff) | |
| download | CMake-9198a92af9e9f05a90d544c76ffeb65aa1a5281e.zip CMake-9198a92af9e9f05a90d544c76ffeb65aa1a5281e.tar.gz CMake-9198a92af9e9f05a90d544c76ffeb65aa1a5281e.tar.bz2 | |
COMP: Fix VS6 and old HP build. This source does not have the #define for hack.
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index d209682..f6047a2 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2107,12 +2107,15 @@ kwsys_stl::string SystemTools 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 @@ kwsys_stl::string SystemTools 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 @@ kwsys_stl::string SystemTools::FindProgram( 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 @@ kwsys_stl::string SystemTools::FindProgram( 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::string SystemTools 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 @@ kwsys_stl::string SystemTools p += "/"; } } + } kwsys_stl::string tryPath; for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin(); p != path.end(); ++p) |