mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 13:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmLinkItem: Simplify tracking of whether link interface is explicit

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGeneratorTarget.cxx
+2 -2
View File
@@ -5219,7 +5219,7 @@ void cmGeneratorTarget::ComputeLinkInterface(
const std::string& config, cmOptionalLinkInterface& iface, const std::string& config, cmOptionalLinkInterface& iface,
cmGeneratorTarget const* headTarget) const cmGeneratorTarget const* headTarget) const
{ {
if (iface.ExplicitLibraries) { if (iface.Explicit) {
if (this->GetType() == cmStateEnums::SHARED_LIBRARY || if (this->GetType() == cmStateEnums::SHARED_LIBRARY ||
this->GetType() == cmStateEnums::STATIC_LIBRARY || this->GetType() == cmStateEnums::STATIC_LIBRARY ||
this->GetType() == cmStateEnums::INTERFACE_LIBRARY) { this->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
@@ -5659,7 +5659,7 @@ void cmGeneratorTarget::ComputeLinkInterfaceLibraries(
return; return;
} }
iface.Exists = true; iface.Exists = true;
iface.ExplicitLibraries = explicitLibraries; iface.Explicit = explicitLibraries != nullptr;
if (explicitLibraries) { if (explicitLibraries) {
// The interface libraries have been explicitly set. // The interface libraries have been explicitly set.
Source/cmLinkItem.h
+1 -1
View File
@@ -87,7 +87,7 @@ struct cmOptionalLinkInterface : public cmLinkInterface
bool LibrariesDone = false; bool LibrariesDone = false;
bool AllDone = false; bool AllDone = false;
bool Exists = false; bool Exists = false;
const char* ExplicitLibraries = nullptr; bool Explicit = false;
}; };
struct cmHeadToLinkInterfaceMap struct cmHeadToLinkInterfaceMap