diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-03 16:11:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-03 16:11:58 (GMT) |
| commit | ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40 (patch) | |
| tree | 117ddfaecefcbe3b5e14f283a6e6e642891a2fe3 /Help | |
| parent | 97944e01b0a632cfeffaa06d211f7425f342d926 (diff) | |
| parent | 005e2cdfb05d92e1b24df2d35ea10ac557b3d831 (diff) | |
| download | CMake-ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40.zip CMake-ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40.tar.gz CMake-ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40.tar.bz2 | |
Merge topic 'android-r22' into release-3.20
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
Diffstat (limited to 'Help')
| -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. |