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

BUG: Quick-fix for accidental commit.

Browse Source
This commit is contained in:
Brad King 2007-08-02 14:28:00 -04:00
parent 8b0575c4ce
commit 695424f6b7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -850,7 +850,7 @@ cmGlobalUnixMakefileGenerator3
t->second.GetName(), depends, commands, true); t->second.GetName(), depends, commands, true);
// Add rules to prepare the target for installation. // Add rules to prepare the target for installation.
if(!exclude && t->second.NeedRelinkBeforeInstall()) if(t->second.NeedRelinkBeforeInstall())
{ {
localName = lg->GetRelativeTargetDirectory(t->second); localName = lg->GetRelativeTargetDirectory(t->second);
localName += "/preinstall"; localName += "/preinstall";
@ -861,12 +861,15 @@ cmGlobalUnixMakefileGenerator3
lg->WriteMakeRule(ruleFileStream, lg->WriteMakeRule(ruleFileStream,
"Pre-install relink rule for target.", "Pre-install relink rule for target.",
localName.c_str(), depends, commands, true); localName.c_str(), depends, commands, true);
if(!exclude)
{
depends.clear(); depends.clear();
depends.push_back(localName); depends.push_back(localName);
commands.clear(); commands.clear();
lg->WriteMakeRule(ruleFileStream, "Prepare target for install.", lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
"preinstall", depends, commands, true); "preinstall", depends, commands, true);
} }
}
// add the clean rule // add the clean rule
localName = lg->GetRelativeTargetDirectory(t->second); localName = lg->GetRelativeTargetDirectory(t->second);