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

Fix bug in != stuff

This commit is contained in:
Bill Hoffman 2005-04-06 09:44:09 -04:00
parent 82aa6aa22d
commit d8f75badb4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/SystemTools.cxx
View File

@ -1972,6 +1972,7 @@ kwsys_stl::string SystemTools::GetCurrentWorkingDirectory()
{ {
char buf[2048]; char buf[2048];
const char* cwd = Getcwd(buf, 2048); const char* cwd = Getcwd(buf, 2048);
std::cerr << cwd << "\n";
kwsys_stl::string path; kwsys_stl::string path;
if ( cwd ) if ( cwd )
{ {
@ -2170,7 +2171,7 @@ SystemToolsAppendComponents(
out_components.erase(out_components.end()-1, out_components.end()); out_components.erase(out_components.end()-1, out_components.end());
} }
} }
else if(!(*i == ".") && !(*i != "")) else if(!(*i == ".") && !(*i == ""))
{ {
out_components.push_back(*i); out_components.push_back(*i);
} }
@ -2180,6 +2181,9 @@ SystemToolsAppendComponents(
kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path, kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path,
const char* in_base) const char* in_base)
{ {
if(in_path) std::cerr << "CollapseFullPath inpath: " << in_path << "\n";
if(in_base) std::cerr << "CollapseFullPath inbase: " << in_base << "\n";
// Collect the output path components. // Collect the output path components.
kwsys_stl::vector<kwsys_stl::string> out_components; kwsys_stl::vector<kwsys_stl::string> out_components;
@ -2187,6 +2191,7 @@ kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path,
kwsys_stl::vector<kwsys_stl::string> path_components; kwsys_stl::vector<kwsys_stl::string> path_components;
SystemTools::SplitPath(in_path, path_components); SystemTools::SplitPath(in_path, path_components);
std::cerr << path_components.size() << "\n";
// If the input path is relative, start with a base path. // If the input path is relative, start with a base path.
if(path_components[0].length() == 0) if(path_components[0].length() == 0)
{ {
@ -2228,7 +2233,7 @@ kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path,
// Update the translation table with this potentially new path. // Update the translation table with this potentially new path.
SystemTools::AddTranslationPath(newPath.c_str(), in_path); SystemTools::AddTranslationPath(newPath.c_str(), in_path);
SystemTools::CheckTranslationPath(newPath); SystemTools::CheckTranslationPath(newPath);
std::cerr << "NewPath : " << newPath << "\n";
// Return the reconstructed path. // Return the reconstructed path.
return newPath; return newPath;
} }