diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-22 19:39:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-25 15:48:17 (GMT) |
| commit | 588fa1bb9eed6e838f58d4f1fb1d01d83ecfd820 (patch) | |
| tree | 3b79f74c7aed659aa4c49b0e3483031f9d391642 /Modules | |
| parent | bf02d625325535f485512eba307cff54c08bb257 (diff) | |
| download | CMake-588fa1bb9eed6e838f58d4f1fb1d01d83ecfd820.zip CMake-588fa1bb9eed6e838f58d4f1fb1d01d83ecfd820.tar.gz CMake-588fa1bb9eed6e838f58d4f1fb1d01d83ecfd820.tar.bz2 | |
Restore support for include_directories() in toolchain files
Any `include_directories()` calls in toolchain files are used during our
ABI detection step even though it does not include any system headers.
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used
to detect implicit include directories. Any `include_directories()` in
a toolchain file are detected as implicit and later excluded from
explicit specification on compiler command lines, thus breaking the
purpose of the calls in the first place.
Fix the implicit include directory detection step to avoid using paths
from `include_directories()` calls in the toolchain file.
Fixes: #19079
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index e0d2449..06f3ba2 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -51,6 +51,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) OUTPUT_VARIABLE OUTPUT COPY_FILE "${BIN}" COPY_FILE_ERROR _copy_error + __CMAKE_INTERNAL ABI ) # Restore original LC_ALL, LC_MESSAGES, and LANG |