https://github.com/Kitware/CMake
Revision 68d67c827fceabc22bb0be76f084391659dc9a28 authored by Brad King on 03 August 2017, 16:03:59 UTC, committed by Brad King on 03 August 2017, 16:03:59 UTC
If `CMAKE_SYSROOT` is set by the user (e.g. via the toolchain file) then we do not set `CMAKE_SYSROOT_COMPILE` to our default. Fix our references to the sysroot's `/usr/include` directory to use `CMAKE_SYSROOT_COMPILE` only if it is set and else `CMAKE_SYSROOT`. Fixes: #17096
1 parent f15cfd8
Tip revision: 68d67c827fceabc22bb0be76f084391659dc9a28 authored by Brad King on 03 August 2017, 16:03:59 UTC
Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE
Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE
Tip revision: 68d67c8
| File | Mode | Size |
|---|---|---|
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .clang-format | -rw-r--r-- | 217 bytes |
| .clang-tidy | -rw-r--r-- | 806 bytes |
| .gitattributes | -rw-r--r-- | 1.1 KB |
| .gitignore | -rw-r--r-- | 64 bytes |
| .hooks-config | -rw-r--r-- | 418 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 9.5 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 12.6 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 31.0 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 1.8 KB |
| CTestConfig.cmake | -rw-r--r-- | 440 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 6.1 KB |
| CompileFlags.cmake | -rw-r--r-- | 3.2 KB |
| Copyright.txt | -rw-r--r-- | 4.9 KB |
| DartConfig.cmake | -rw-r--r-- | 374 bytes |
| README.rst | -rw-r--r-- | 2.9 KB |
| bootstrap | -rwxr-xr-x | 47.2 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 790 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
