diff options
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 4 | ||||
| -rw-r--r-- | Source/cmComputeLinkInformation.h | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 0b02ae1..331e3fd 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -594,7 +594,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item, cmTarget* tgt) std::string exe = tgt->GetFullPath(config, this->UseImportLibrary, true); linkItem += exe; - this->Items.push_back(Item(linkItem, true)); + this->Items.push_back(Item(linkItem, true, tgt)); this->Depends.push_back(exe); } else @@ -1020,7 +1020,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item, } // Now add the full path to the library. - this->Items.push_back(Item(item, true)); + this->Items.push_back(Item(item, true, target)); } //---------------------------------------------------------------------------- diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 0ce47bf..147b8ff 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -40,11 +40,14 @@ public: struct Item { - Item(): Value(), IsPath(true) {} - Item(Item const& item): Value(item.Value), IsPath(item.IsPath) {} - Item(std::string const& v, bool p): Value(v), IsPath(p) {} + Item(): Value(), IsPath(true), Target(0) {} + Item(Item const& item): + Value(item.Value), IsPath(item.IsPath), Target(item.Target) {} + Item(std::string const& v, bool p, cmTarget* target = 0): + Value(v), IsPath(p), Target(target) {} std::string Value; bool IsPath; + cmTarget* Target; }; typedef std::vector<Item> ItemVector; ItemVector const& GetItems(); |