From 636ca7f25c3016805bf0214bc563f30728d9de0b Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Feb 2022 13:41:23 -0500 Subject: find_package: Fix find module name in --debug-find output --- Source/cmFindPackageCommand.cxx | 9 ++++----- Tests/RunCMake/find_package/FromPATHEnv-stderr.txt | 2 +- Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index d29201b..5f1544d 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -789,14 +789,13 @@ void cmFindPackageCommand::RestoreFindDefinitions() bool cmFindPackageCommand::FindModule(bool& found) { - std::string module = cmStrCat("Find", this->Name, ".cmake"); + std::string moduleFileName = cmStrCat("Find", this->Name, ".cmake"); bool system = false; - std::string debugBuffer = - cmStrCat("find_package considered the following paths for ", this->Name, - ".cmake\n"); + std::string debugBuffer = cmStrCat( + "find_package considered the following paths for ", moduleFileName, ":\n"); std::string mfile = this->Makefile->GetModulesFile( - module, system, this->DebugMode, debugBuffer); + moduleFileName, system, this->DebugMode, debugBuffer); if (this->DebugMode) { if (mfile.empty()) { debugBuffer = cmStrCat(debugBuffer, "The file was not found.\n"); diff --git a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt index 55b6a7a..5fe89fd 100644 --- a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt +++ b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt @@ -1,5 +1,5 @@ ^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 diff --git a/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt b/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt index e3685bc..f921804 100644 --- a/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt +++ b/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt @@ -1,5 +1,5 @@ ^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 -- cgit v0.12