summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-10-07 14:24:38 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2020-10-07 14:24:38 (GMT)
commit0a638e86b28b54aa155c49fb78ee6d5c15184d7f (patch)
treee465ea679e8155e13752d4dfee2ed2ef540f48da /Help/manual
parent55689ce800fe3822ab85ec040a682f721eaf0196 (diff)
downloadCMake-0a638e86b28b54aa155c49fb78ee6d5c15184d7f.zip
CMake-0a638e86b28b54aa155c49fb78ee6d5c15184d7f.tar.gz
CMake-0a638e86b28b54aa155c49fb78ee6d5c15184d7f.tar.bz2
Help: Add note about Visual Studio tools for Android
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-toolchains.7.rst10
1 files changed, 6 insertions, 4 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index e8badd4..88cddf6 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -312,8 +312,9 @@ is specific to the Android development environment to be used.
For :ref:`Visual Studio Generators`, CMake expects :ref:`NVIDIA Nsight Tegra
Visual Studio Edition <Cross Compiling for Android with NVIDIA Nsight Tegra
-Visual Studio Edition>` to be installed. See that section for further
-configuration details.
+Visual Studio Edition>` or the :ref:`Visual Studio tools for Android
+<Cross Compiling for Android with the NDK>` to be installed. See those sections
+for further configuration details.
For :ref:`Makefile Generators` and the :generator:`Ninja` generator,
CMake expects one of these environments:
@@ -363,8 +364,9 @@ CMake uses the following steps to select one of the environments:
Cross Compiling for Android with the NDK
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-A toolchain file may configure :ref:`Makefile Generators` or the
-:generator:`Ninja` generator to target Android for cross-compiling.
+A toolchain file may configure :ref:`Makefile Generators`,
+:ref:`Ninja Generators`, or :ref:`Visual Studio Generators` to target
+Android for cross-compiling.
Configure use of an Android NDK with the following variables: