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 | 957a117c705766d5d4d2d6c807217fe9d154cdff (patch) | |
| tree | 5bffa910e35b950f868202f8da2a96427f3c0b3e /Help/manual | |
| parent | a88efbc9cfad2d69e1f1e8875383c4e9c1f39849 (diff) | |
| parent | 005e2cdfb05d92e1b24df2d35ea10ac557b3d831 (diff) | |
| download | CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.zip CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.tar.gz CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.tar.bz2 | |
Merge topic 'android-r22'
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/manual')
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
2 files changed, 5 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 |