From d634d203973086f32f6d26e636eb1c9cc1acc545 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 10 Feb 2022 12:08:13 -0500
Subject: find_package: Avoid printing debug output header multiple times

---
 Source/cmFindPackageCommand.cxx                           | 15 ++++-----------
 Tests/RunCMake/find_package/FromPATHEnv-stderr.txt        |  4 ----
 .../RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt  |  4 ----
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7bcb719..a8dff95 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -237,7 +237,6 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   // Process debug mode
   this->DebugMode = this->ComputeIfDebugModeWanted() ||
     this->Makefile->GetCMakeInstance()->GetDebugFindPkgOutput(this->Name);
-  this->DebugBuffer.clear();
 
   // Parse the arguments.
   enum Doing
@@ -610,15 +609,14 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
         loadedPackage = true;
       }
     }
-
-    if (this->DebugMode) {
-      this->DebugMessage(this->DebugBuffer);
-      this->DebugBuffer.clear();
-    }
   }
 
   this->AppendSuccessInformation();
 
+  if (!this->DebugBuffer.empty()) {
+    this->DebugMessage(this->DebugBuffer);
+  }
+
   return loadedPackage;
 }
 
@@ -947,11 +945,6 @@ bool cmFindPackageCommand::HandlePackageMode(
     result = false;
   }
 
-  if (this->DebugMode) {
-    this->DebugMessage(this->DebugBuffer);
-    this->DebugBuffer.clear();
-  }
-
   // package not found
   if (result && !found) {
     // warn if package required or neither quiet nor in config mode
diff --git a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
index 19108f4..691d7f0 100644
--- a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
+++ b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
@@ -77,8 +77,4 @@
 ]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig.cmake
 
 Call Stack \(most recent call first\):
-  CMakeLists.txt:[0-9]+ \(include\)
-+
-CMake Debug Log at FromPATHEnv.cmake:[0-9]+ \(find_package\):
-Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt b/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt
index a708282..ef5ec33 100644
--- a/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt
+++ b/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt
@@ -77,8 +77,4 @@
 ]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig.cmake
 
 Call Stack \(most recent call first\):
-  CMakeLists.txt:[0-9]+ \(include\)
-+
-CMake Debug Log at FromPATHEnvDebugPkg.cmake:[0-9]+ \(find_package\):
-Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)$
-- 
cgit v0.12