From 5c171ca898f92e07cb68dd7fa77d0a993b08cc9c Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 18 Feb 2019 14:32:22 -0500 Subject: Restore unconditional use of "standard" include directories `CMAKE__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 --- Source/cmLocalGenerator.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 0c2efa7..c4f2cde 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1010,9 +1010,7 @@ std::vector> 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)); } } -- cgit v0.12