diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-02 18:42:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-02 18:43:16 (GMT) |
| commit | 94648953befa6464e46469b1fa8d46b68d486321 (patch) | |
| tree | 0858b729ee32be157f8e45bd041854bb7d038a5f /Source | |
| parent | 7bacf0233be03100b830e65cdd02a0d1fb2c2a13 (diff) | |
| download | CMake-94648953befa6464e46469b1fa8d46b68d486321.zip CMake-94648953befa6464e46469b1fa8d46b68d486321.tar.gz CMake-94648953befa6464e46469b1fa8d46b68d486321.tar.bz2 | |
cmLinkItem: Simplify tracking of whether link interface is explicit
We now only need a boolean.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLinkItem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7340bc2..42683db 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -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. diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index 6450c62..d71ff49 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -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 |