echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmLocalGenerator: Clarify check for membership in multiple sets

Browse Source
This commit is contained in:
Alexander Grund 2021-07-06 16:11:42 +02:00 committed by Brad King
parent 10969fd003
commit 86595b3002
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -1254,9 +1254,9 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit(
isCorCxx](std::string const& dir) -> bool {
std::string const& real_dir = this->GlobalGenerator->GetRealPath(dir);
return
// Do not exclude directories that are not in an excluded set.
(!cm::contains(implicitSet, real_dir) &&
!cm::contains(implicitExclude, dir))
// Do not exclude directories that are not in any excluded set.
!(cm::contains(implicitSet, real_dir) ||
cm::contains(implicitExclude, dir))
// Do not exclude entries of the CPATH environment variable even though
// they are implicitly searched by the compiler. They are meant to be
// user-specified directories that can be re-ordered or converted to