diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-13 13:27:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-13 13:27:17 (GMT) |
| commit | 9203aff851e711561bfb906d435f6594afe6a9ce (patch) | |
| tree | 99ced1cdb52ce0fc717da254a7d0227fd73c20eb /Help/manual | |
| parent | 6733d602afec0218feeddea93b043cf36aa22e4a (diff) | |
| parent | 3d00be13ee04a48be1a6d0d64057494839e1df6f (diff) | |
| download | CMake-9203aff851e711561bfb906d435f6594afe6a9ce.zip CMake-9203aff851e711561bfb906d435f6594afe6a9ce.tar.gz CMake-9203aff851e711561bfb906d435f6594afe6a9ce.tar.bz2 | |
Merge topic 'android-unified-headers'
3d00be13 Android: Add support for unified headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !956
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 5 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
2 files changed, 6 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. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 6ee4257..1a2726d 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -255,6 +255,7 @@ Variables that Control the Build /variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES /variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES /variable/CMAKE_ANDROID_NDK + /variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS /variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG /variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION /variable/CMAKE_ANDROID_PROCESS_MAX |