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

cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-08 01:05:41 +02:00
parent 9ca4cae51e
commit 61c02decce
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorTarget.cxx
View File

@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
return &hm.begin()->second; return &hm.begin()->second;
} }
cmOptionalLinkInterface& iface = hm[head->Target]; cmOptionalLinkInterface& iface = hm[head];
if(!iface.LibrariesDone) if(!iface.LibrariesDone)
{ {
iface.LibrariesDone = true; iface.LibrariesDone = true;
@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
return &hm.begin()->second; return &hm.begin()->second;
} }
cmOptionalLinkInterface& iface = hm[head->Target]; cmOptionalLinkInterface& iface = hm[head];
if(!iface.LibrariesDone) if(!iface.LibrariesDone)
{ {
iface.LibrariesDone = true; iface.LibrariesDone = true;
@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
return &hm.begin()->second; return &hm.begin()->second;
} }
cmOptionalLinkInterface& iface = hm[headTarget->Target]; cmOptionalLinkInterface& iface = hm[headTarget];
if(!iface.AllDone) if(!iface.AllDone)
{ {
iface.AllDone = true; iface.AllDone = true;

3
Source/cmLinkItem.h
View File

@ -15,6 +15,7 @@
#include "cmListFileCache.h" #include "cmListFileCache.h"
class cmGeneratorTarget;
class cmTarget; class cmTarget;
// Basic information about each link item. // Basic information about each link item.
@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
}; };
struct cmHeadToLinkInterfaceMap: struct cmHeadToLinkInterfaceMap:
public std::map<cmTarget const*, cmOptionalLinkInterface> public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
{ {
}; };