mirror of
https://github.com/reactos/CMake.git
synced 2024-12-05 02:06:34 +00:00
4bafa3922e
The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify
language-wide system include directories, 2016-05-24) to use
`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`. Rather than recognizing
this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory
explicitly, 2017-01-20) worked around the problem by incorrectly
removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`
so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`.
By not filtering out `/usr/include` from user-specified include
directories, we allow the code
include_directories(${CMAKE_SYSROOT}/usr/include)
to place the include directory too early on the command line.
Fix support for standard include directories to not be filtered by
implicit include directories, and do not remove `/usr/include` from the
list of implicit include directories for Android builds. Add a test
case to verify that an explicit `/usr/include` is ignored in favor
of the standard directory at the end.
Fixes: #17059
|
||
|---|---|---|
| .. | ||
| sysinc | ||
| android_sysinc.c | ||
| android_sysinc.cxx | ||
| android.c | ||
| android.cxx | ||
| android.h | ||
| BadSYSROOT-result.txt | ||
| BadSYSROOT-stderr.txt | ||
| BadSYSROOT.cmake | ||
| CMakeLists.txt | ||
| common.cmake | ||
| ndk-arm64-v8a-stdout.txt | ||
| ndk-arm64-v8a.cmake | ||
| ndk-armeabi-arm-stdout.txt | ||
| ndk-armeabi-arm.cmake | ||
| ndk-armeabi-thumb-stdout.txt | ||
| ndk-armeabi-thumb.cmake | ||
| ndk-armeabi-v7a-neon-stdout.txt | ||
| ndk-armeabi-v7a-neon.cmake | ||
| ndk-armeabi-v7a-stdout.txt | ||
| ndk-armeabi-v7a.cmake | ||
| ndk-badabi-result.txt | ||
| ndk-badabi-stderr.txt | ||
| ndk-badabi.cmake | ||
| ndk-badarm-result.txt | ||
| ndk-badarm-stderr.txt | ||
| ndk-badarm.cmake | ||
| ndk-badneon-result.txt | ||
| ndk-badneon-stderr.txt | ||
| ndk-badneon.cmake | ||
| ndk-badstl-result.txt | ||
| ndk-badstl-stderr.txt | ||
| ndk-badstl.cmake | ||
| ndk-badver-result.txt | ||
| ndk-badver-stderr.txt | ||
| ndk-badver.cmake | ||
| ndk-badvernum-result.txt | ||
| ndk-badvernum-stderr.txt | ||
| ndk-badvernum.cmake | ||
| ndk-mips64-stdout.txt | ||
| ndk-mips64.cmake | ||
| ndk-mips-stdout.txt | ||
| ndk-mips.cmake | ||
| ndk-sysroot-armeabi-stdout.txt | ||
| ndk-sysroot-armeabi.cmake | ||
| ndk-x86_64-stdout.txt | ||
| ndk-x86_64.cmake | ||
| ndk-x86-stdout.txt | ||
| ndk-x86.cmake | ||
| RunCMakeTest.cmake | ||
| standalone-stdout.txt | ||
| standalone-sysroot-stdout.txt | ||
| standalone-sysroot.cmake | ||
| standalone.cmake | ||