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

BUG: Removing accidental commit.

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

25
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -731,7 +731,8 @@ cmGlobalUnixMakefileGenerator3
makefileName = localName; makefileName = localName;
makefileName += "/build.make"; makefileName += "/build.make";
bool needRequiresStep = this->NeedRequiresStep(t->second); bool needRequiresStep =
this->NeedRequiresStep(lg,t->second.GetName());
lg->WriteDivider(ruleFileStream); lg->WriteDivider(ruleFileStream);
ruleFileStream ruleFileStream
@ -861,15 +862,12 @@ 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);
@ -1170,17 +1168,18 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
bool cmGlobalUnixMakefileGenerator3 bool cmGlobalUnixMakefileGenerator3
::NeedRequiresStep(cmTarget const& target) ::NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg,const char *name)
{ {
std::set<cmStdString> languages; std::map<cmStdString,cmLocalUnixMakefileGenerator3::IntegrityCheckSet>&
target.GetLanguages(languages); checkSet = lg->GetIntegrityCheckSet()[name];
for(std::set<cmStdString>::const_iterator l = languages.begin(); for(std::map<cmStdString,
l != languages.end(); ++l) cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator
l = checkSet.begin(); l != checkSet.end(); ++l)
{ {
std::string var = "CMAKE_NEEDS_REQUIRES_STEP_"; std::string name2 = "CMAKE_NEEDS_REQUIRES_STEP_";
var += *l; name2 += l->first;
var += "_FLAG"; name2 += "_FLAG";
if(target.GetMakefile()->GetDefinition(var.c_str())) if(lg->GetMakefile()->GetDefinition(name2.c_str()))
{ {
return true; return true;
} }

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -165,7 +165,7 @@ protected:
cmTarget &target); cmTarget &target);
// does this generator need a requires step for any of its targets // does this generator need a requires step for any of its targets
bool NeedRequiresStep(cmTarget const&); bool NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg, const char *);
// Setup target names // Setup target names
virtual const char* GetAllTargetName() { return "all"; } virtual const char* GetAllTargetName() { return "all"; }