mirror of
https://github.com/reactos/CMake.git
synced 2025-02-27 15:36:40 +00:00
BUG: Fix rule name for subdirectory traversal to use relative paths. This was broken by the recent subdirectory changes.
This commit is contained in:
parent
76f9050026
commit
1c73f2f743
@ -1313,18 +1313,19 @@ cmLocalUnixMakefileGenerator2
|
||||
{
|
||||
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.
|
||||
if((*i)->GetMakefile()->GetPreOrder())
|
||||
{
|
||||
this->WriteSubdirRule(makefileStream, pass,
|
||||
(*i)->GetMakefile()->GetStartOutputDirectory(),
|
||||
lastPre);
|
||||
this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPre);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->WriteSubdirRule(makefileStream, pass,
|
||||
(*i)->GetMakefile()->GetStartOutputDirectory(),
|
||||
lastPost);
|
||||
this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPost);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user