mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in -I/usr/include exclusion logic

Browse Source 
The change in commit 15ad830062 (Refactor exclusion of -I/usr/include to
avoid per-language values, 2019-01-21, v3.14.0-rc1~108^2~4) caused the
exclusion to apply to Fortran, but it was only meant for C, CXX, and
CUDA.  The purpose of the change was to prepare for the value of
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` to be computed from the
actual compiler instead of hard-coded.  We need to preserve exclusion of
`-I/usr/include` if the compiler has any implicit include directory that
looks intended to replace it, e.g. `<sdk>/usr/include` on macOS.

Fixes: #18914
This commit is contained in:
Brad King
2019-02-13 09:23:31 -05:00
parent 017598a444
commit 557b2d6e65
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Platform/UnixPaths.cmake
-5
View File
@@ -63,11 +63,6 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
/lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
)
# Platform-wide directories to avoid adding via -I<dir>.
list(APPEND CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES
/usr/include
)
# Default per-language values. These may be later replaced after
# parsing the implicit directory information from compiler output.
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT