summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-02-10 17:17:39 (GMT)
committerBrad King <brad.king@kitware.com>2022-02-10 20:25:05 (GMT)
commita690523fcf31ca7dc062fca746c0f76e405c0e7a (patch)
tree738daee0f71987ba12b8bea30f02e0cbca6be997
parent0a08377c4a1fc9684fa3bd695f375b1e5ee267ab (diff)
downloadCMake-a690523fcf31ca7dc062fca746c0f76e405c0e7a.zip
CMake-a690523fcf31ca7dc062fca746c0f76e405c0e7a.tar.gz
CMake-a690523fcf31ca7dc062fca746c0f76e405c0e7a.tar.bz2
cmFindPackageCommand: Drop ComputeIfDebugModeWanted overload
The overload for `--debug-find-pkg` has the same signature as the base class method for `--debug-find-var`. To avoid confusion, drop the overload and inline it its only call site.
-rw-r--r--Source/cmFindPackageCommand.cxx9
-rw-r--r--Source/cmFindPackageCommand.h2
2 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index fac0e08..c40fea0 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -235,7 +235,8 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
this->SearchPathSuffixes.emplace_back();
// Process debug mode
- this->DebugMode = this->ComputeIfDebugModeWanted(this->Name);
+ this->DebugMode = this->ComputeIfDebugModeWanted() ||
+ this->Makefile->GetCMakeInstance()->GetDebugFindPkgOutput(this->Name);
this->DebugBuffer.clear();
// Parse the arguments.
@@ -621,12 +622,6 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
return loadedPackage;
}
-bool cmFindPackageCommand::ComputeIfDebugModeWanted(std::string const& var)
-{
- return this->ComputeIfDebugModeWanted() ||
- this->Makefile->GetCMakeInstance()->GetDebugFindPkgOutput(var);
-}
-
bool cmFindPackageCommand::FindPackageUsingModuleMode()
{
bool foundModule = false;
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 439d934..f921bb0 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -40,7 +40,6 @@ class cmSearchPath;
class cmFindPackageCommand : public cmFindCommon
{
public:
- using cmFindCommon::ComputeIfDebugModeWanted;
/*! A sorting order strategy to be applied to recovered package folders (see
* FIND_PACKAGE_SORT_ORDER)*/
enum /*class*/ SortOrderType
@@ -121,7 +120,6 @@ private:
bool ReadListFile(const std::string& f, PolicyScopeRule psr);
void StoreVersionFound();
- bool ComputeIfDebugModeWanted(std::string const& var);
void ComputePrefixes();
void FillPrefixesPackageRoot();
void FillPrefixesCMakeEnvironment();