summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-10-10 01:25:58 (GMT)
committerBrad King <brad.king@kitware.com>2006-10-10 01:25:58 (GMT)
commit0fe0523810b1408c94c722ebae8aa47429d55d6d (patch)
tree68f23b45ce5d356e1649275532a1b00fa2015ce6 /Source/cmMakefileTargetGenerator.cxx
parent9fca6a7837a41ed7dc0f891abdbc32a4a118f2aa (diff)
downloadCMake-0fe0523810b1408c94c722ebae8aa47429d55d6d.zip
CMake-0fe0523810b1408c94c722ebae8aa47429d55d6d.tar.gz
CMake-0fe0523810b1408c94c722ebae8aa47429d55d6d.tar.bz2
BUG: Fixed out-of-source subdirectories to work when they are also out-of-binary. Updated the OutOfSource test to test this feature.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 449d37a..381df2e 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1048,9 +1048,8 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(const char* main_output,
bool relink)
{
// Compute the name of the driver target.
- std::string dir = this->Makefile->GetStartOutputDirectory();
- dir += "/";
- dir += this->LocalGenerator->GetTargetDirectory(*this->Target);
+ std::string dir =
+ this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
std::string buildTargetRuleName = dir;
buildTargetRuleName += relink?"/preinstall":"/build";
buildTargetRuleName = this->Convert(buildTargetRuleName.c_str(),