diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-22 13:52:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-22 13:52:23 (GMT) |
| commit | 5ba09a75a25f0876596af39fa32eff69cc44e1d6 (patch) | |
| tree | f6bdb917b137d5bc161755a0d0c6f886f376c2cf /Modules | |
| parent | 3d9924447702df5a85977041f301aaab3fbe7215 (diff) | |
| parent | 5d317930230daf61c72c2fa4bdd7b74dbcd7b190 (diff) | |
| download | CMake-5ba09a75a25f0876596af39fa32eff69cc44e1d6.zip CMake-5ba09a75a25f0876596af39fa32eff69cc44e1d6.tar.gz CMake-5ba09a75a25f0876596af39fa32eff69cc44e1d6.tar.bz2 | |
Merge branch 'android-unified-headers' into release-3.9
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Common.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake index ac72676..6360376 100644 --- a/Modules/Platform/Android-Common.cmake +++ b/Modules/Platform/Android-Common.cmake @@ -160,9 +160,13 @@ macro(__android_compiler_common lang) # Do not do this for a standalone toolchain because it is already # tied to a specific API version. if(CMAKE_ANDROID_NDK) - list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include") if(NOT CMAKE_ANDROID_NDK_DEPRECATED_HEADERS) - list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}") + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES + "${CMAKE_SYSROOT_COMPILE}/usr/include" + "${CMAKE_SYSROOT_COMPILE}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}" + ) + else() + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include") endif() list(REMOVE_ITEM CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include") endif() |