From a65a404186c69fabc61ea87459e22110c998fb1b Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 23 Mar 2019 18:10:28 +0100 Subject: cmTarget: Inline private HasImportLibrary method --- Source/cmTarget.cxx | 11 +++-------- Source/cmTarget.h | 3 --- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a90e1b5..52e8a40 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -545,13 +545,6 @@ bool cmTarget::IsExecutableWithExports() const this->GetPropertyAsBool("ENABLE_EXPORTS")); } -bool cmTarget::HasImportLibrary() const -{ - return (impl->DLLPlatform && - (this->GetType() == cmStateEnums::SHARED_LIBRARY || - this->IsExecutableWithExports())); -} - bool cmTarget::IsFrameworkOnApple() const { return ((this->GetType() == cmStateEnums::SHARED_LIBRARY || @@ -1875,7 +1868,9 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config, // If we needed to find one of the mapped configurations but did not // On a DLL platform there may be only IMPORTED_IMPLIB for a shared // library or an executable with exports. - bool allowImp = this->HasImportLibrary(); + bool allowImp = (impl->DLLPlatform && + (this->GetType() == cmStateEnums::SHARED_LIBRARY || + this->IsExecutableWithExports())); // If a mapping was found, check its configurations. for (std::vector::const_iterator mci = mappedConfigs.begin(); diff --git a/Source/cmTarget.h b/Source/cmTarget.h index c0a0cb5..93d8303 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -269,9 +269,6 @@ private: private: cmTargetInternalPointer impl; - ///! Return whether or not the target has a DLL import library. - bool HasImportLibrary() const; - // Internal representation details. friend class cmTargetInternals; friend class cmGeneratorTarget; -- cgit v0.12