summaryrefslogtreecommitdiffstats
path: root/Source/cmFindLibraryCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-01-08 14:30:41 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-01-08 14:30:56 (GMT)
commit639a5998c78bf7c93096445391c4163ec5fd3c9a (patch)
tree0da71acf33f258e65f9aa295a4a887cc5b9d0869 /Source/cmFindLibraryCommand.cxx
parent733d2b6063f5f6608610839c3197a48e5cde1a63 (diff)
parent1fafe35e81518f2d6bbd45fa8a7aa50a3681551c (diff)
downloadCMake-639a5998c78bf7c93096445391c4163ec5fd3c9a.zip
CMake-639a5998c78bf7c93096445391c4163ec5fd3c9a.tar.gz
CMake-639a5998c78bf7c93096445391c4163ec5fd3c9a.tar.bz2
Merge topic 'fix-openbsd'
1fafe35e81 Source: Restore compilation on OpenBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9085
Diffstat (limited to 'Source/cmFindLibraryCommand.cxx')
-rw-r--r--Source/cmFindLibraryCommand.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index df77ad0..9df7665 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -207,7 +207,7 @@ struct cmFindLibraryHelper
std::string BestPath;
// Support for OpenBSD shared library naming: lib<name>.so.<major>.<minor>
- bool OpenBSD;
+ bool IsOpenBSD;
bool DebugMode;
@@ -320,7 +320,7 @@ cmFindLibraryHelper::cmFindLibraryHelper(std::string debugName, cmMakefile* mf,
this->RegexFromList(this->SuffixRegexStr, this->Suffixes);
// Check whether to use OpenBSD-style library version comparisons.
- this->OpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
+ this->IsOpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
"FIND_LIBRARY_USE_OPENBSD_VERSIONING");
}
@@ -390,7 +390,7 @@ void cmFindLibraryHelper::AddName(std::string const& name)
std::string regex = cmStrCat('^', this->PrefixRegexStr);
this->RegexFromLiteral(regex, name);
regex += this->SuffixRegexStr;
- if (this->OpenBSD) {
+ if (this->IsOpenBSD) {
regex += "(\\.[0-9]+\\.[0-9]+)?";
}
regex += "$";
@@ -472,7 +472,7 @@ bool cmFindLibraryHelper::CheckDirectoryForName(std::string const& path,
size_type suffix = this->GetSuffixIndex(name.Regex.match(2));
unsigned int major = 0;
unsigned int minor = 0;
- if (this->OpenBSD) {
+ if (this->IsOpenBSD) {
sscanf(name.Regex.match(3).c_str(), ".%u.%u", &major, &minor);
}
if (this->BestPath.empty() || prefix < bestPrefix ||