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 | |
| 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')
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 5 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/3.9.rst | 5 | ||||
| -rw-r--r-- | Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst | 9 |
4 files changed, 20 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 diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index 65bcd2e..333ba9e 100644 --- a/Help/release/3.9.rst +++ b/Help/release/3.9.rst @@ -62,6 +62,11 @@ Commands Variables --------- +* A :variable:`CMAKE_ANDROID_NDK_DEPRECATED_HEADERS` variable was added + for use when :ref:`Cross Compiling for Android with the NDK` to request + use of the deprecated headers even when unified headers are available. + The default is now to use unified headers if available. + * A :variable:`CMAKE_AUTOMOC_DEPEND_FILTERS` variable was introduced to allow :variable:`CMAKE_AUTOMOC` to extract additional dependency file names for ``moc`` from the contents of source files. diff --git a/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst b/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst new file mode 100644 index 0000000..8ea1257 --- /dev/null +++ b/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst @@ -0,0 +1,9 @@ +CMAKE_ANDROID_NDK_DEPRECATED_HEADERS +------------------------------------ + +When :ref:`Cross Compiling for Android with the NDK`, this variable +may be set to specify whether to use the deprecated per-api-level +headers instead of the unified headers. + +If not specified, the default will be *false* if using a NDK version +that provides the unified headers and *true* otherwise. |