mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

find_library: Improve regex readability in --debug-find output

Browse Source 
If there is only one possible library prefix/suffix, omit the capture
group around it in the debug output.
This commit is contained in:
Thomas Schenker
2023-07-07 19:42:28 +02:00
committed by Brad King
parent b8b53db1b3
commit f60e921262
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmFindLibraryCommand.cxx
View File

@@ -251,8 +251,14 @@ struct cmFindLibraryHelper
void DebugLibraryFailed(std::string const& name, std::string const& path) void DebugLibraryFailed(std::string const& name, std::string const& path)
{ {
if (this->DebugMode) { if (this->DebugMode) {
auto regexName = // To improve readability of the debug output, if there is only one
cmStrCat(this->PrefixRegexStr, name, this->SuffixRegexStr); // prefix/suffix, use the plain prefix/suffix instead of the regex.
const auto& prefix = (this->Prefixes.size() == 1) ? this->Prefixes[0]
: this->PrefixRegexStr;
const auto& suffix = (this->Suffixes.size() == 1) ? this->Suffixes[0]
: this->SuffixRegexStr;
auto regexName = cmStrCat(prefix, name, suffix);
this->DebugSearches.FailedAt(path, regexName); this->DebugSearches.FailedAt(path, regexName);
} }
} }

2
Tests/RunCMake/find_library/FromScriptMode-stderr-darwin.txt
View File

@@ -1,4 +1,4 @@
.*find_library considered the following locations.* .*find_library considered the following locations.*
.*\(lib\)library_no_exist\(\\.tbd\|\\.dylib\|\\.so\|\\.a\).* .*liblibrary_no_exist\(\\.tbd\|\\.dylib\|\\.so\|\\.a\).*
.*The item was found at.* .*The item was found at.*
.*lib/libcreated.a.* .*lib/libcreated.a.*

2
Tests/RunCMake/find_library/FromScriptMode-stderr.txt
View File

@@ -1,4 +1,4 @@
.*find_library considered the following locations.* .*find_library considered the following locations.*
.*\(lib\)library_no_exist\(\\.so\|\\.a\).* .*liblibrary_no_exist\(\\.so\|\\.a\).*
.*The item was found at.* .*The item was found at.*
.*lib/libcreated.a.* .*lib/libcreated.a.*