Browse Source

Restore unconditional use of "standard" include directories

`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` is meant to unconditionally
add explicitly specified include directories to compile lines.  In
commit 5f34bdc7f9 (cmLocalGenerator: Refactor
`GetIncludeDirectoriesImplicit` method, 2019-01-25, v3.14.0-rc1~65^2~1)
a condition was accidentally added to exclude implicit include
directories.  Drop that condition.

Fixes: #18936
Brad King 6 years ago
parent
commit
5c171ca898
1 changed files with 1 additions and 3 deletions
  1. 1 3
      Source/cmLocalGenerator.cxx

+ 1 - 3
Source/cmLocalGenerator.cxx

@@ -1010,9 +1010,7 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit(
     userDirs.reserve(userDirs.size() + userStandardDirs.size());
     for (std::string& usd : userStandardDirs) {
       cmSystemTools::ConvertToUnixSlashes(usd);
-      if (notImplicit(usd)) {
-        emitDir(usd);
-      }
+      emitDir(usd);
       userDirs.emplace_back(std::move(usd));
     }
   }