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 /Help/manual/cmake-toolchains.7.rst | |
| 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 'Help/manual/cmake-toolchains.7.rst')
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst index 64abe9a..8554e87 100644 --- a/Help/manual/cmake-toolchains.7.rst +++ b/Help/manual/cmake-toolchains.7.rst @@ -385,6 +385,11 @@ Configure use of an Android NDK with the following variables: If not specified, a default for this variable will be chosen as specified :ref:`above <Cross Compiling for Android>`. +:variable:`CMAKE_ANDROID_NDK_DEPRECATED_HEADERS` + Set to a true value to use the deprecated per-api-level headers + instead of the unified headers. If not specified, the default will + be false unless using a NDK that does not provide unified headers. + :variable:`CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION` Set to the version of the NDK toolchain to be selected as the compiler. If not specified, the default will be the latest available GCC toolchain. |