mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-09 23:59:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Normalize paths when checking for implicit include dirs

Browse Source 
GCC replaces implicit include directories with user-supplied ones if
they point to the same directory, even if the path strings differ.
This commit is contained in:
Daniel Scharrer
2019-06-22 22:22:39 +02:00
parent f2bce265b7
commit d88b38d05d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
+5 -3
View File
@@ -1017,7 +1017,7 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit(
}
for (std::string const& i : impDirVec) {
if (implicitSet.insert(i).second) {
if (implicitSet.insert(cmSystemTools::GetRealPath(i)).second) {
implicitDirs.emplace_back(i);
}
}
@@ -1028,7 +1028,8 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit(
&lang](std::string const& dir) {
return (
// Do not exclude directories that are not in an excluded set.
((implicitSet.find(dir) == implicitSet.end()) &&
((implicitSet.find(cmSystemTools::GetRealPath(dir)) ==
implicitSet.end()) &&
(implicitExclude.find(dir) == implicitExclude.end()))
// Do not exclude entries of the CPATH environment variable even though
// they are implicitly searched by the compiler. They are meant to be
@@ -1082,7 +1083,8 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit(
if (!stripImplicitDirs) {
// Append implicit directories that were requested by the user only
for (BT<std::string> const& udr : userDirs) {
if (implicitSet.find(udr.Value) != implicitSet.end()) {
if (implicitSet.find(cmSystemTools::GetRealPath(udr.Value)) !=
implicitSet.end()) {
emitBT(udr);
}
}