From d65db7c6bb7959662fa9a3805c50d7605b9aecc0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Mar 2007 13:19:39 -0500 Subject: 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. --- Source/cmLocalUnixMakefileGenerator3.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 2d45ee9..3c616ed 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/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 += "/"; } -- cgit v0.12