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

BUG: Avoid converting the subdirectory name to a relative path twice.

This commit is contained in:
Brad King 2005-04-07 15:09:13 -04:00
parent 738bbc767b
commit 5fb8342177
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -1313,19 +1313,18 @@ 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, subdir.c_str(), lastPre); this->WriteSubdirRule(makefileStream, pass,
(*i)->GetMakefile()->GetStartOutputDirectory(),
lastPre);
} }
else else
{ {
this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPost); this->WriteSubdirRule(makefileStream, pass,
(*i)->GetMakefile()->GetStartOutputDirectory(),
lastPost);
} }
} }
} }
@ -2230,10 +2229,13 @@ std::string
cmLocalUnixMakefileGenerator2 cmLocalUnixMakefileGenerator2
::GetSubdirTargetName(const char* pass, const char* subdir) ::GetSubdirTargetName(const char* pass, const char* subdir)
{ {
// Convert the subdirectory name to a relative path to keep it short.
std::string reldir = this->ConvertToRelativePath(subdir);
// Convert the subdirectory name to a valid make target name. // Convert the subdirectory name to a valid make target name.
std::string s = pass; std::string s = pass;
s += "_"; s += "_";
s += subdir; s += reldir;
// Replace "../" with 3 underscores. This allows one .. at the beginning. // Replace "../" with 3 underscores. This allows one .. at the beginning.
size_t pos = s.find("../"); size_t pos = s.find("../");