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

Makefiles: Remove duplicate code. 

The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is
logically equivalent to cmStrictTargetComparison.
This commit is contained in:
Stephen Kelly 2014-03-17 15:32:19 +01:00
parent 2e0611f981
commit c3a2f78b5a
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -957,21 +957,6 @@ cmGlobalUnixMakefileGenerator3::RecordTargetProgress(
tp.VariableFile = tg->GetProgressFileNameFull();
}
//----------------------------------------------------------------------------
bool
cmGlobalUnixMakefileGenerator3::ProgressMapCompare
::operator()(cmTarget const* l, cmTarget const* r) const
{
// Order by target name.
if(int c = strcmp(l->GetName().c_str(), r->GetName().c_str()))
{
return c < 0;
}
// Order duplicate targets by binary directory.
return strcmp(l->GetMakefile()->GetCurrentOutputDirectory(),
r->GetMakefile()->GetCurrentOutputDirectory()) < 0;
}
//----------------------------------------------------------------------------
void
cmGlobalUnixMakefileGenerator3::TargetProgress

4
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -185,10 +185,8 @@ protected:
std::vector<unsigned long> Marks;
void WriteProgressVariables(unsigned long total, unsigned long& current);
};
struct ProgressMapCompare { bool operator()(cmTarget const*,
cmTarget const*) const; };
typedef std::map<cmTarget const*, TargetProgress,
ProgressMapCompare> ProgressMapType;
cmStrictTargetComparison> ProgressMapType;
ProgressMapType ProgressMap;
size_t CountProgressMarksInTarget(cmTarget const* target,