cmLinkItem: Simplify tracking of whether link interface is explicit

We now only need a boolean.
This commit is contained in:
Brad King
2019-08-02 14:42:14 -04:00
parent 7bacf0233b
commit 94648953be
2 changed files with 3 additions and 3 deletions

View File

@@ -5219,7 +5219,7 @@ void cmGeneratorTarget::ComputeLinkInterface(
const std::string& config, cmOptionalLinkInterface& iface,
cmGeneratorTarget const* headTarget) const
{
if (iface.ExplicitLibraries) {
if (iface.Explicit) {
if (this->GetType() == cmStateEnums::SHARED_LIBRARY ||
this->GetType() == cmStateEnums::STATIC_LIBRARY ||
this->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
@@ -5659,7 +5659,7 @@ void cmGeneratorTarget::ComputeLinkInterfaceLibraries(
return;
}
iface.Exists = true;
iface.ExplicitLibraries = explicitLibraries;
iface.Explicit = explicitLibraries != nullptr;
if (explicitLibraries) {
// The interface libraries have been explicitly set.

View File

@@ -87,7 +87,7 @@ struct cmOptionalLinkInterface : public cmLinkInterface
bool LibrariesDone = false;
bool AllDone = false;
bool Exists = false;
const char* ExplicitLibraries = nullptr;
bool Explicit = false;
};
struct cmHeadToLinkInterfaceMap