mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmOrderDirectories: Factor out implicit directory check

Browse Source
This commit is contained in:
Brad King
2017-03-01 11:55:37 -05:00
parent 2b1cdd85b8
commit b1a37362b8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmOrderDirectories.cxx
View File

@@ -287,8 +287,7 @@ void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath,
}
}
if (this->ImplicitDirectories.find(dir) !=
this->ImplicitDirectories.end()) {
if (this->IsImplicitDirectory(dir)) {
this->ImplicitDirEntries.push_back(
new cmOrderDirectoriesConstraintSOName(this, fullPath, soname));
return;
@@ -316,8 +315,7 @@ void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath)
// Implicit link directories need special handling.
if (!this->ImplicitDirectories.empty()) {
std::string dir = cmSystemTools::GetFilenamePath(fullPath);
if (this->ImplicitDirectories.find(dir) !=
this->ImplicitDirectories.end()) {
if (this->IsImplicitDirectory(dir)) {
this->ImplicitDirEntries.push_back(
new cmOrderDirectoriesConstraintLibrary(this, fullPath));
return;
@@ -350,6 +348,12 @@ void cmOrderDirectories::SetImplicitDirectories(
this->ImplicitDirectories = implicitDirs;
}
bool cmOrderDirectories::IsImplicitDirectory(std::string const& dir)
{
return this->ImplicitDirectories.find(dir) !=
this->ImplicitDirectories.end();
}
void cmOrderDirectories::SetLinkExtensionInfo(
std::vector<std::string> const& linkExtensions,
std::string const& removeExtRegex)
@@ -394,8 +398,7 @@ void cmOrderDirectories::AddOriginalDirectories(
for (std::vector<std::string>::const_iterator di = dirs.begin();
di != dirs.end(); ++di) {
// We never explicitly specify implicit link directories.
if (this->ImplicitDirectories.find(*di) !=
this->ImplicitDirectories.end()) {
if (this->IsImplicitDirectory(*di)) {
continue;
}

2
Source/cmOrderDirectories.h
View File

@@ -82,6 +82,8 @@ private:
// Compare directories after resolving symlinks.
bool IsSameDirectory(std::string const& l, std::string const& r);
bool IsImplicitDirectory(std::string const& dir);
std::string const& GetRealPath(std::string const& dir);
std::map<std::string, std::string> RealPaths;