mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 15:18:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

find_package: Fix find module name in --debug-find output

Browse Source
This commit is contained in:
Brad King
2022-02-10 13:41:23 -05:00
parent 596e185409
commit 636ca7f25c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmFindPackageCommand.cxx
View File

@@ -789,14 +789,13 @@ void cmFindPackageCommand::RestoreFindDefinitions()
bool cmFindPackageCommand::FindModule(bool& found) bool cmFindPackageCommand::FindModule(bool& found)
{ {
std::string module = cmStrCat("Find", this->Name, ".cmake"); std::string moduleFileName = cmStrCat("Find", this->Name, ".cmake");
bool system = false; bool system = false;
std::string debugBuffer = std::string debugBuffer = cmStrCat(
cmStrCat("find_package considered the following paths for ", this->Name, "find_package considered the following paths for ", moduleFileName, ":\n");
".cmake\n");
std::string mfile = this->Makefile->GetModulesFile( std::string mfile = this->Makefile->GetModulesFile(
module, system, this->DebugMode, debugBuffer); moduleFileName, system, this->DebugMode, debugBuffer);
if (this->DebugMode) { if (this->DebugMode) {
if (mfile.empty()) { if (mfile.empty()) {
debugBuffer = cmStrCat(debugBuffer, "The file was not found.\n"); debugBuffer = cmStrCat(debugBuffer, "The file was not found.\n");

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

@@ -1,5 +1,5 @@
^CMake Debug Log at FromPATHEnv.cmake:[0-9]+ \(find_package\): ^CMake Debug Log at FromPATHEnv.cmake:[0-9]+ \(find_package\):
find_package considered the following paths for Resolved.cmake find_package considered the following paths for FindResolved.cmake:
[^ [^
]*/Modules/FindResolved.cmake ]*/Modules/FindResolved.cmake

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

@@ -1,5 +1,5 @@
^CMake Debug Log at FromPATHEnvDebugPkg.cmake:[0-9]+ \(find_package\): ^CMake Debug Log at FromPATHEnvDebugPkg.cmake:[0-9]+ \(find_package\):
find_package considered the following paths for Resolved.cmake find_package considered the following paths for FindResolved.cmake:
[^ [^
]*/Modules/FindResolved.cmake ]*/Modules/FindResolved.cmake