diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-03 14:24:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-03 15:27:50 (GMT) |
| commit | 4950d3573331678b58fef36524723579edaa7172 (patch) | |
| tree | 20c5ff16bb1e8f2e670c5419886a2d40e60cc343 | |
| parent | 746906242d6e5aca50df621f12cfa0ad71816647 (diff) | |
| download | CMake-4950d3573331678b58fef36524723579edaa7172.zip CMake-4950d3573331678b58fef36524723579edaa7172.tar.gz CMake-4950d3573331678b58fef36524723579edaa7172.tar.bz2 | |
Help: Document CMAKE_ANDROID_NDK_VERSION variable
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/3.20.rst | 3 | ||||
| -rw-r--r-- | Help/variable/CMAKE_ANDROID_NDK_VERSION.rst | 8 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst index 0267ca3..1ededee 100644 --- a/Help/manual/cmake-toolchains.7.rst +++ b/Help/manual/cmake-toolchains.7.rst @@ -359,6 +359,10 @@ CMake uses the following steps to select one of the environments: * Else, an error diagnostic will be issued that neither the NDK or Standalone Toolchain can be found. +.. versionadded:: 3.20 + If an Android NDK is selected, its version number is reported + in the :variable:`CMAKE_ANDROID_NDK_VERSION` variable. + .. _`Cross Compiling for Android with the NDK`: Cross Compiling for Android with the NDK diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index b6764ac..4317dd4 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -278,6 +278,7 @@ Variables that Describe the System /variable/ANDROID /variable/APPLE /variable/BORLAND + /variable/CMAKE_ANDROID_NDK_VERSION /variable/CMAKE_CL_64 /variable/CMAKE_COMPILER_2005 /variable/CMAKE_HOST_APPLE diff --git a/Help/release/3.20.rst b/Help/release/3.20.rst index b36d1c2..eede362 100644 --- a/Help/release/3.20.rst +++ b/Help/release/3.20.rst @@ -73,6 +73,9 @@ Platforms - The default :variable:`CMAKE_BUILD_TYPE` for Android is now ``RelWithDebInfo``. + - The :variable:`CMAKE_ANDROID_NDK_VERSION` variable was added to + report the version of the NDK. + File-Based API -------------- diff --git a/Help/variable/CMAKE_ANDROID_NDK_VERSION.rst b/Help/variable/CMAKE_ANDROID_NDK_VERSION.rst new file mode 100644 index 0000000..5428d52 --- /dev/null +++ b/Help/variable/CMAKE_ANDROID_NDK_VERSION.rst @@ -0,0 +1,8 @@ +CMAKE_ANDROID_NDK_VERSION +------------------------- + +.. versionadded:: 3.20 + +When :ref:`Cross Compiling for Android with the NDK` and using an +Android NDK version 11 or higher, this variable is provided by +CMake to report the NDK version number. |