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

BUG: Reverting previous changes related to using an empty string for a relative path to the current directory. Too many places want the . version. Instead we can just convert the . to an empty string in the one place that motiviated the original change.

This commit is contained in:
Brad King 2007-03-14 16:29:10 -04:00
parent b8bd0f80db
commit 9da6f96d98
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalGenerator.cxx
View File

@ -2222,11 +2222,11 @@ cmLocalGenerator
return in_remote; return in_remote;
} }
// If the entire path is in common then just return an empty string. // If the entire path is in common then just return a ".".
if(common == remote.size() && if(common == remote.size() &&
common == local.size()) common == local.size())
{ {
return ""; return ".";
} }
// If the entire path is in common except for a trailing slash then // If the entire path is in common except for a trailing slash then

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -68,6 +68,10 @@ void cmLocalUnixMakefileGenerator3::Configure()
// directory from the top output directory. // directory from the top output directory.
this->HomeRelativeOutputPath = this->HomeRelativeOutputPath =
this->Convert(this->Makefile->GetStartOutputDirectory(), HOME_OUTPUT); this->Convert(this->Makefile->GetStartOutputDirectory(), HOME_OUTPUT);
if(this->HomeRelativeOutputPath == ".")
{
this->HomeRelativeOutputPath = "";
}
if(!this->HomeRelativeOutputPath.empty()) if(!this->HomeRelativeOutputPath.empty())
{ {
this->HomeRelativeOutputPath += "/"; this->HomeRelativeOutputPath += "/";

4
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -963,10 +963,6 @@ cmLocalVisualStudio7Generator
if(cmSystemTools::FileIsFullPath(dir.c_str())) if(cmSystemTools::FileIsFullPath(dir.c_str()))
{ {
std::string rel = this->Convert(dir.c_str(), START_OUTPUT, UNCHANGED); std::string rel = this->Convert(dir.c_str(), START_OUTPUT, UNCHANGED);
if(rel.empty())
{
rel = ".";
}
if(rel.size() < dir.size()) if(rel.size() < dir.size())
{ {
dir = rel; dir = rel;