[cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.197 1.198

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Compute HomeRelativeOutputPath following the rules of RelativePathTopBinary by going through the Convert() method.  This supports out-of-binary build trees without using relative paths that go outside trees managed by CMake.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- cmLocalUnixMakefileGenerator3.cxx	8 Mar 2007 18:05:02 -0000	1.197
+++ cmLocalUnixMakefileGenerator3.cxx	8 Mar 2007 18:19:39 -0000	1.198
@@ -64,11 +64,11 @@
 //----------------------------------------------------------------------------
 void cmLocalUnixMakefileGenerator3::Configure()
 {
-  // Include the rule file for each object.
-  this->HomeRelativeOutputPath = 
-    cmSystemTools::RelativePath(this->Makefile->GetHomeOutputDirectory(),
-                                this->Makefile->GetStartOutputDirectory());
-  if (this->HomeRelativeOutputPath.size())
+  // Compute the path to use when referencing the current output
+  // directory from the top output directory.
+  this->HomeRelativeOutputPath =
+    this->Convert(this->Makefile->GetStartOutputDirectory(), HOME_OUTPUT);
+  if(!this->HomeRelativeOutputPath.empty())
     {
     this->HomeRelativeOutputPath += "/";
     }