diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-12 14:57:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-12 15:47:30 (GMT) |
| commit | 3d00be13ee04a48be1a6d0d64057494839e1df6f (patch) | |
| tree | 415b7bcfcf2bc0d4df1dcd2766a378c008b61884 /Modules/Platform/Android | |
| parent | a131316a95fde7ae19ec851369d9a186e6488d0c (diff) | |
| download | CMake-3d00be13ee04a48be1a6d0d64057494839e1df6f.zip CMake-3d00be13ee04a48be1a6d0d64057494839e1df6f.tar.gz CMake-3d00be13ee04a48be1a6d0d64057494839e1df6f.tar.bz2 | |
Android: Add support for unified headers
The unified headers are preferred as of NDK r15, so use them by default
if available and provide an option to use the deprecated headers.
Inspired-by: Florent Castelli <florent.castelli@gmail.com>
Fixes: #16584
Diffstat (limited to 'Modules/Platform/Android')
| -rw-r--r-- | Modules/Platform/Android/abi-common.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Platform/Android/abi-common.cmake b/Modules/Platform/Android/abi-common.cmake index 3b0eb01..10fb897 100644 --- a/Modules/Platform/Android/abi-common.cmake +++ b/Modules/Platform/Android/abi-common.cmake @@ -3,6 +3,10 @@ string(APPEND _ANDROID_ABI_INIT_CFLAGS " -no-canonical-prefixes" ) +if(CMAKE_ANDROID_NDK AND NOT CMAKE_ANDROID_NDK_DEPRECATED_HEADERS) + string(APPEND _ANDROID_ABI_INIT_CFLAGS " -D__ANDROID_API__=${CMAKE_SYSTEM_VERSION}") +endif() + if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 16) set(CMAKE_POSITION_INDEPENDENT_CODE ON) |