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

cmTargetCollectLinkLanguages: Remove cmMakefile dependency

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-25 11:49:03 +01:00
parent 7f6beddae3
commit 383bfd9543
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorTarget.cxx
View File

@ -1793,7 +1793,7 @@ public:
UNORDERED_SET<std::string>& languages, UNORDERED_SET<std::string>& languages,
cmGeneratorTarget const* head): cmGeneratorTarget const* head):
Config(config), Languages(languages), HeadTarget(head), Config(config), Languages(languages), HeadTarget(head),
Makefile(target->Target->GetMakefile()), Target(target) Target(target)
{ this->Visited.insert(target); } { this->Visited.insert(target); }
void Visit(cmLinkItem const& item) void Visit(cmLinkItem const& item)
@ -1805,7 +1805,8 @@ public:
bool noMessage = false; bool noMessage = false;
cmake::MessageType messageType = cmake::FATAL_ERROR; cmake::MessageType messageType = cmake::FATAL_ERROR;
std::stringstream e; std::stringstream e;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028)) switch(this->Target->GetLocalGenerator()
->GetPolicyStatus(cmPolicies::CMP0028))
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
{ {
@ -1859,7 +1860,6 @@ private:
std::string Config; std::string Config;
UNORDERED_SET<std::string>& Languages; UNORDERED_SET<std::string>& Languages;
cmGeneratorTarget const* HeadTarget; cmGeneratorTarget const* HeadTarget;
cmMakefile* Makefile;
const cmGeneratorTarget* Target; const cmGeneratorTarget* Target;
std::set<cmGeneratorTarget const*> Visited; std::set<cmGeneratorTarget const*> Visited;
}; };