diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-18 19:32:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-18 22:10:07 (GMT) |
| commit | 5c171ca898f92e07cb68dd7fa77d0a993b08cc9c (patch) | |
| tree | 66205574a064e22bb935ec0664430ba345fb3565 /Source/cmLocalGenerator.cxx | |
| parent | 9502276f8272cf8ed10ceafe4413b0e24cc6535f (diff) | |
| download | CMake-5c171ca898f92e07cb68dd7fa77d0a993b08cc9c.zip CMake-5c171ca898f92e07cb68dd7fa77d0a993b08cc9c.tar.gz CMake-5c171ca898f92e07cb68dd7fa77d0a993b08cc9c.tar.bz2 | |
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
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 1 insertions, 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<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)); } } |