diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-06 13:44:09 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-06 13:44:09 (GMT) |
commit | d8f75badb400d5e75a26bb6cf1198d3dd73a1561 (patch) | |
tree | 1998d14d44bad81ff60236c13cf2ef7d6eb8b742 | |
parent | 82aa6aa22d843d1fee5df5ee47bd312680ef12ac (diff) | |
download | CMake-d8f75badb400d5e75a26bb6cf1198d3dd73a1561.zip CMake-d8f75badb400d5e75a26bb6cf1198d3dd73a1561.tar.gz CMake-d8f75badb400d5e75a26bb6cf1198d3dd73a1561.tar.bz2 |
Fix bug in != stuff
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 1e79ee8..ee946db 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -1972,6 +1972,7 @@ kwsys_stl::string SystemTools::GetCurrentWorkingDirectory() { char buf[2048]; const char* cwd = Getcwd(buf, 2048); + std::cerr << cwd << "\n"; kwsys_stl::string path; if ( cwd ) { @@ -2170,7 +2171,7 @@ SystemToolsAppendComponents( out_components.erase(out_components.end()-1, out_components.end()); } } - else if(!(*i == ".") && !(*i != "")) + else if(!(*i == ".") && !(*i == "")) { out_components.push_back(*i); } @@ -2180,6 +2181,9 @@ SystemToolsAppendComponents( kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path, 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. 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; SystemTools::SplitPath(in_path, path_components); + std::cerr << path_components.size() << "\n"; // If the input path is relative, start with a base path. 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. SystemTools::AddTranslationPath(newPath.c_str(), in_path); SystemTools::CheckTranslationPath(newPath); - + std::cerr << "NewPath : " << newPath << "\n"; // Return the reconstructed path. return newPath; } |