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

Order cmGeneratorTargetsType elements deterministically. 

Define a custom ordering functor to deterministically and strictly
order the cmTarget* key. Otherwise the order would be dependent on
runtime pointer values, which breaks assumptions of some generators.

The functor orders first by target name, and then by directory. Multiple
global targets may have the same name, such as edit_cache, but their
directory differentiates them.
This commit is contained in:
Stephen Kelly 2013-11-20 16:58:01 +01:00
parent 7246e635fe
commit abb13ea565
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGeneratorTarget.cxx
View File

@ -692,3 +692,14 @@ void cmGeneratorTarget::GenerateTargetManifest(const char* config) const
gg->AddToManifest(config? config:"", f); gg->AddToManifest(config? config:"", f);
} }
} }
bool cmStrictTargetComparison::operator()(cmTarget *t1, cmTarget *t2) const
{
int nameResult = strcmp(t1->GetName(), t2->GetName());
if (nameResult == 0)
{
return strcmp(t1->GetMakefile()->GetStartDirectory(),
t2->GetMakefile()->GetStartDirectory()) < 0;
}
return nameResult < 0;
}

8
Source/cmGeneratorTarget.h
View File

@ -100,6 +100,12 @@ private:
void operator=(cmGeneratorTarget const&); void operator=(cmGeneratorTarget const&);
}; };
typedef std::map<cmTarget*, cmGeneratorTarget*> cmGeneratorTargetsType; struct cmStrictTargetComparison {
bool operator()(cmTarget *t1, cmTarget *t2) const;
};
typedef std::map<cmTarget*,
cmGeneratorTarget*,
cmStrictTargetComparison> cmGeneratorTargetsType;
#endif #endif