diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-22 14:12:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-22 14:12:59 (GMT) |
| commit | 751f0e0adca2c99c1bff5b911d78f861c32c228f (patch) | |
| tree | 86bb89cecc468c7b5ce17c5879ef59c650315343 /Modules/Platform | |
| parent | 396b618c523d042df1c96cb08be1163e5c72d150 (diff) | |
| parent | 5d317930230daf61c72c2fa4bdd7b74dbcd7b190 (diff) | |
| download | CMake-751f0e0adca2c99c1bff5b911d78f861c32c228f.zip CMake-751f0e0adca2c99c1bff5b911d78f861c32c228f.tar.gz CMake-751f0e0adca2c99c1bff5b911d78f861c32c228f.tar.bz2 | |
Merge topic 'android-unified-headers'
5d317930 Android: Fix include path for unified headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !997
Diffstat (limited to 'Modules/Platform')
| -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() |