Browse Source

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.

Brad King 18 years ago
parent
commit
d65db7c6bb
1 changed files with 5 additions and 5 deletions
  1. 5 5
      Source/cmLocalUnixMakefileGenerator3.cxx

+ 5 - 5
Source/cmLocalUnixMakefileGenerator3.cxx

@@ -64,11 +64,11 @@ cmLocalUnixMakefileGenerator3::~cmLocalUnixMakefileGenerator3()
 //----------------------------------------------------------------------------
 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 += "/";
     }