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

find_package: Avoid printing debug output header multiple times

Browse Source
This commit is contained in:
Brad King
2022-02-10 12:08:13 -05:00
parent df3e29450a
commit d634d20397
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmFindPackageCommand.cxx
View File

@@ -237,7 +237,6 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
// Process debug mode // Process debug mode
this->DebugMode = this->ComputeIfDebugModeWanted() || this->DebugMode = this->ComputeIfDebugModeWanted() ||
this->Makefile->GetCMakeInstance()->GetDebugFindPkgOutput(this->Name); this->Makefile->GetCMakeInstance()->GetDebugFindPkgOutput(this->Name);
this->DebugBuffer.clear();
// Parse the arguments. // Parse the arguments.
enum Doing enum Doing
@@ -610,15 +609,14 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
loadedPackage = true; loadedPackage = true;
} }
} }
if (this->DebugMode) {
this->DebugMessage(this->DebugBuffer);
this->DebugBuffer.clear();
}
} }
this->AppendSuccessInformation(); this->AppendSuccessInformation();
if (!this->DebugBuffer.empty()) {
this->DebugMessage(this->DebugBuffer);
}
return loadedPackage; return loadedPackage;
} }
@@ -947,11 +945,6 @@ bool cmFindPackageCommand::HandlePackageMode(
result = false; result = false;
} }
if (this->DebugMode) {
this->DebugMessage(this->DebugBuffer);
this->DebugBuffer.clear();
}
// package not found // package not found
if (result && !found) { if (result && !found) {
// warn if package required or neither quiet nor in config mode // warn if package required or neither quiet nor in config mode

4
Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
View File

@@ -76,9 +76,5 @@
[^ [^
]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig.cmake ]*/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\): Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$ CMakeLists.txt:[0-9]+ \(include\)$

4
Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt
View File

@@ -76,9 +76,5 @@
[^ [^
]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig.cmake ]*/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\): Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$ CMakeLists.txt:[0-9]+ \(include\)$