mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

cmBinUtilsWindowsPELinker: Resolve cased and lower names together

Browse Source
This commit is contained in:
Brad King
2026-08-27 17:00:41 -04:00
parent 6ed37c9ed0
commit 4ce278389f
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmBinUtilsWindowsPELinker.cxx
+15 -16
View File
@@ -103,23 +103,13 @@ bool cmBinUtilsWindowsPELinker::ScanDependencies(std::string const& file,
}
Dependency path;
bool resolved = false;
if (!this->ResolveDependency(lib.LowerName, origin, path.LowerName,
resolved)) {
if (!this->ResolveDependency(lib, origin, path, resolved)) {
return false;
}
if (resolved) {
if (this->Archive->IsPostExcluded(path.LowerName)) {
continue;
}
#ifdef _WIN32
path.CasedName = ReplaceWithActualNameCasing(path.LowerName);
#else
path.CasedName = [&lib](std::string libPath) -> std::string {
libPath.replace(libPath.end() - lib.CasedName.size(), libPath.end(),
lib.CasedName);
return libPath;
}(path.LowerName);
#endif
bool unique;
this->Archive->AddResolvedPath(lib.CasedName, path.CasedName, unique);
if (unique &&
@@ -135,9 +125,9 @@ bool cmBinUtilsWindowsPELinker::ScanDependencies(std::string const& file,
return true;
}
bool cmBinUtilsWindowsPELinker::ResolveDependency(std::string const& name,
bool cmBinUtilsWindowsPELinker::ResolveDependency(Dependency const& lib,
std::string const& origin,
std::string& path,
Dependency& path,
bool& resolved)
{
auto dirs = this->Archive->GetSearchDirectories();
@@ -156,11 +146,20 @@ bool cmBinUtilsWindowsPELinker::ResolveDependency(std::string const& name,
dirs.insert(dirs.begin(), origin);
for (auto const& searchPath : dirs) {
path = cmStrCat(searchPath, '/', name);
if (!cmSystemTools::PathExists(path)) {
path.LowerName = cmStrCat(searchPath, '/', lib.LowerName);
if (!cmSystemTools::PathExists(path.LowerName)) {
continue;
}
this->NormalizePath(path);
this->NormalizePath(path.LowerName);
#ifdef _WIN32
path.CasedName = ReplaceWithActualNameCasing(path.LowerName);
#else
path.CasedName = [&lib](std::string libPath) -> std::string {
libPath.replace(libPath.end() - lib.CasedName.size(), libPath.end(),
lib.CasedName);
return libPath;
}(path.LowerName);
#endif
resolved = true;
return true;
}
Source/cmBinUtilsWindowsPELinker.h
+2 -2
View File
@@ -31,6 +31,6 @@ private:
std::string LowerName;
};
bool ResolveDependency(std::string const& name, std::string const& origin,
std::string& path, bool& resolved);
bool ResolveDependency(Dependency const& lib, std::string const& origin,
Dependency& path, bool& resolved);
};