summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkDepends.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-14 17:35:57 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-14 17:35:57 (GMT)
commitff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (patch)
tree667dcc41f74ca7c4c541a051219c398f544d6eac /Source/cmComputeLinkDepends.h
parent2380896a056a29f22dd440369f4ab30137306ab9 (diff)
parent1fdccff5894914d4408e64c0b55e52c376e64ad4 (diff)
downloadCMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.zip
CMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.tar.gz
CMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.tar.bz2
Merge topic 'use-generator-target'
1fdccff5 Genex: Port implementation detail to cmGeneratorTarget. ce75c86e cmGeneratorTarget: Move GetSupportDirectory from cmTarget. 526cc7dc cmGeneratorTarget: Move HasImportLibrary from cmTarget. 8d2e3e53 cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget. a143d4ac Sublime: Port some API to cmGeneratorTarget. 993aace7 cmGeneratorTarget: Port processILibs to cmGeneratorTarget. 43ade995 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget. 5fd2f43f cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget. f7acd742 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget. 763f7b19 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget. ceb35b63 cmLinkItem: Port to cmGeneratorTarget. bf2d061a cmGeneratorTarget: Move FindTargetToLink from cmTarget. 61c02dec cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget. 9ca4cae5 cmGeneratorTarget: Move GetUtilityItems from cmTarget. d6b394ed cmComputeLinkDepends: Port result API to cmGeneratorTarget. 7c8236ef cmComputeLinkInformation: Port result API to cmGeneratorTarget. ...
Diffstat (limited to 'Source/cmComputeLinkDepends.h')
-rw-r--r--Source/cmComputeLinkDepends.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index fc484de..d9760aa 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,6 +14,7 @@
#include "cmStandardIncludes.h"
#include "cmTarget.h"
+#include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h"
@@ -52,7 +53,7 @@ public:
EntryVector const& Compute();
void SetOldLinkDirMode(bool b);
- std::set<cmTarget const*> const& GetOldWrongConfigItems() const
+ std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const
{ return this->OldWrongConfigItems; }
private:
@@ -72,8 +73,8 @@ private:
void AddDirectLinkEntries();
template <typename T>
void AddLinkEntries(int depender_index, std::vector<T> const& libs);
- cmTarget const* FindTargetToLink(int depender_index,
- const std::string& name);
+ cmGeneratorTarget const* FindTargetToLink(int depender_index,
+ const std::string& name);
// One entry for each unique item.
std::vector<LinkEntry> EntryList;
@@ -150,7 +151,7 @@ private:
// Record of the original link line.
std::vector<int> OriginalEntries;
- std::set<cmTarget const*> OldWrongConfigItems;
+ std::set<cmGeneratorTarget const*> OldWrongConfigItems;
void CheckWrongConfigItem(cmLinkItem const& item);
int ComponentOrderId;