diff options
author | Brad King <brad.king@kitware.com> | 2008-10-09 19:30:07 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-10-09 19:30:07 (GMT) |
commit | ad44a41a187fc3a1b829397e1c9f7c5f305c084b (patch) | |
tree | 39e49f9e554aa602fae42ff084cf628a81f9166a /Source/cmMakefileLibraryTargetGenerator.cxx | |
parent | 416bf5730f33b5760bbcea9b4fb871cc9d717c6a (diff) | |
download | CMake-ad44a41a187fc3a1b829397e1c9f7c5f305c084b.zip CMake-ad44a41a187fc3a1b829397e1c9f7c5f305c084b.tar.gz CMake-ad44a41a187fc3a1b829397e1c9f7c5f305c084b.tar.bz2 |
ENH: Fix optional use of relative paths.
These changes refactor cmLocalGenerator methods Convert and
ConvertToOutputForExisting to support references inside the build tree
using relative paths. After this commit, all tests pass with Makefile
generators when relative paths are enabled by default. See issue #7779.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 9c0cc38..1a43831 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -591,7 +591,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules this->LocalGenerator->CreateCDCommand (commands1, this->Makefile->GetStartOutputDirectory(), - this->Makefile->GetHomeOutputDirectory()); + cmLocalGenerator::HOME_OUTPUT); commands.insert(commands.end(), commands1.begin(), commands1.end()); commands1.clear(); } @@ -872,7 +872,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules this->LocalGenerator->CreateCDCommand (commands1, this->Makefile->GetStartOutputDirectory(), - this->Makefile->GetHomeOutputDirectory()); + cmLocalGenerator::HOME_OUTPUT); commands.insert(commands.end(), commands1.begin(), commands1.end()); commands1.clear(); @@ -888,7 +888,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules commands1.push_back(symlink); this->LocalGenerator->CreateCDCommand(commands1, this->Makefile->GetStartOutputDirectory(), - this->Makefile->GetHomeOutputDirectory()); + cmLocalGenerator::HOME_OUTPUT); commands.insert(commands.end(), commands1.begin(), commands1.end()); commands1.clear(); } |