kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix rule name for subdirectory traversal to use relative paths. This was broken by the recent subdirectory changes.

Browse Source
This commit is contained in:
Brad King 2005-04-07 13:48:20 -04:00
parent 76f9050026
commit 1c73f2f743
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -1313,18 +1313,19 @@ cmLocalUnixMakefileGenerator2
{ {
if(!(*i)->GetExcludeAll()) if(!(*i)->GetExcludeAll())
{ {
// Construct the name of the subdirectory relative to this
// directory.
std::string subdir =
this->ConvertToRelativePath((*i)->GetMakefile()->GetStartOutputDirectory());
// Add the subdirectory rule either for pre-order or post-order. // Add the subdirectory rule either for pre-order or post-order.
if((*i)->GetMakefile()->GetPreOrder()) if((*i)->GetMakefile()->GetPreOrder())
{ {
this->WriteSubdirRule(makefileStream, pass, this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPre);
(*i)->GetMakefile()->GetStartOutputDirectory(),
lastPre);
} }
else else
{ {
this->WriteSubdirRule(makefileStream, pass, this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPost);
(*i)->GetMakefile()->GetStartOutputDirectory(),
lastPost);
} }
} }
} }