From a7acafc977dbd1f8fdf453c0bda10eafabc811c5 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 22 Sep 2020 14:13:48 -0400 Subject: FindPackage: find_package(MODULE) respects CMAKE_FIND_DEBUG_MODE Fixes #21216 --- Source/cmFindPackageCommand.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index c462651..87c0834 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -578,6 +578,11 @@ bool cmFindPackageCommand::InitialPass(std::vector const& args) loadedPackage = true; } } + + if (this->DebugMode) { + this->DebugMessage(this->DebugBuffer); + this->DebugBuffer.clear(); + } } this->AppendSuccessInformation(); -- cgit v0.12 From b423a20ce18fe7b70014aeb3280391a717fdc866 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 22 Sep 2020 15:32:31 -0400 Subject: FindPackage: Provide better debug message when is false --- Source/cmFindPackageCommand.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 87c0834..de3cb29 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -753,6 +753,17 @@ bool cmFindPackageCommand::FindModule(bool& found) this->Makefile->AddDefinition(var, "1"); bool result = this->ReadListFile(mfile, DoPolicyScope); this->Makefile->RemoveDefinition(var); + + if (this->DebugMode) { + std::string foundVar = cmStrCat(this->Name, "_FOUND"); + if (this->Makefile->IsDefinitionSet(foundVar) && + !this->Makefile->IsOn(foundVar)) { + + this->DebugBuffer = cmStrCat( + this->DebugBuffer, "The module is considered not found due to ", + foundVar, " being FALSE."); + } + } return result; } return true; -- cgit v0.12