[cmake-commits] king committed cmLocalVisualStudio7Generator.cxx 1.181 1.182 cmLocalGenerator.cxx 1.203 1.204 cmLocalUnixMakefileGenerator3.cxx 1.200 1.201

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9089

Modified Files:
	cmLocalVisualStudio7Generator.cxx cmLocalGenerator.cxx 
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
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.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- cmLocalGenerator.cxx	14 Mar 2007 17:36:24 -0000	1.203
+++ cmLocalGenerator.cxx	14 Mar 2007 20:29:10 -0000	1.204
@@ -2222,11 +2222,11 @@
     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() &&
      common == local.size())
     {
-    return "";
+    return ".";
     }
 
   // If the entire path is in common except for a trailing slash then

Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- cmLocalUnixMakefileGenerator3.cxx	8 Mar 2007 19:57:28 -0000	1.200
+++ cmLocalUnixMakefileGenerator3.cxx	14 Mar 2007 20:29:10 -0000	1.201
@@ -68,6 +68,10 @@
   // directory from the top output directory.
   this->HomeRelativeOutputPath =
     this->Convert(this->Makefile->GetStartOutputDirectory(), HOME_OUTPUT);
+  if(this->HomeRelativeOutputPath == ".")
+    {
+    this->HomeRelativeOutputPath = "";
+    }
   if(!this->HomeRelativeOutputPath.empty())
     {
     this->HomeRelativeOutputPath += "/";

Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- cmLocalVisualStudio7Generator.cxx	14 Mar 2007 19:35:10 -0000	1.181
+++ cmLocalVisualStudio7Generator.cxx	14 Mar 2007 20:29:10 -0000	1.182
@@ -963,10 +963,6 @@
     if(cmSystemTools::FileIsFullPath(dir.c_str()))
       {
       std::string rel = this->Convert(dir.c_str(), START_OUTPUT, UNCHANGED);
-      if(rel.empty())
-        {
-        rel = ".";
-        }
       if(rel.size() < dir.size())
         {
         dir = rel;