summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-10-18 17:49:45 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-10-18 17:49:52 (GMT)
commit65542be9700c47dd8c267f9ca8831f91d73640ff (patch)
tree5be9e6be5d9d2a00da666d195a8c0bce1108d8e5
parent5b2900a1954f46352863b21ea0994b765244d365 (diff)
parenta739b55bb6783200c209f7a0007ff87a1c0dee4b (diff)
downloadCMake-65542be9700c47dd8c267f9ca8831f91d73640ff.zip
CMake-65542be9700c47dd8c267f9ca8831f91d73640ff.tar.gz
CMake-65542be9700c47dd8c267f9ca8831f91d73640ff.tar.bz2
Merge topic 'doc-CMAKE_ANDROID_API' into release-3.25
a739b55bb6 Help: Clarify historical-only role of CMAKE_ANDROID_API variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7800
-rw-r--r--Help/variable/CMAKE_ANDROID_API.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Help/variable/CMAKE_ANDROID_API.rst b/Help/variable/CMAKE_ANDROID_API.rst
index 4388bf2..aba9b6e 100644
--- a/Help/variable/CMAKE_ANDROID_API.rst
+++ b/Help/variable/CMAKE_ANDROID_API.rst
@@ -8,6 +8,7 @@ Edition`, this variable may be set to specify the default value for the
:prop_tgt:`ANDROID_API` target property. See that target property for
additional information.
-Otherwise, when :ref:`Cross Compiling for Android`, this variable provides
-the Android API version number targeted. This will be the same value as
-the :variable:`CMAKE_SYSTEM_VERSION` variable for ``Android`` platforms.
+When :ref:`Cross Compiling for Android`, the :variable:`CMAKE_SYSTEM_VERSION`
+variable represents the Android API version number targeted. For historical
+reasons, if a toolchain file sets ``CMAKE_ANDROID_API``, but not
+``CMAKE_SYSTEM_VERSION``, the latter will be initialized using the former.