diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-07 18:16:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-07 18:16:40 (GMT) |
| commit | a354440de997a84351967950510cce029d9fe065 (patch) | |
| tree | e465ea679e8155e13752d4dfee2ed2ef540f48da | |
| parent | 2e53641d7693a702bbc03ea84f51a137987af4ed (diff) | |
| parent | 0a638e86b28b54aa155c49fb78ee6d5c15184d7f (diff) | |
| download | CMake-a354440de997a84351967950510cce029d9fe065.zip CMake-a354440de997a84351967950510cce029d9fe065.tar.gz CMake-a354440de997a84351967950510cce029d9fe065.tar.bz2 | |
Merge topic 'vs-android-doc'
0a638e86b2 Help: Add note about Visual Studio tools for Android
55689ce800 Help: Add ref to Ninja Generators section
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5343
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index 6f88c0a..8ca2bf6 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -52,6 +52,8 @@ Makefile Generators /generator/Unix Makefiles /generator/Watcom WMake +.. _`Ninja Generators`: + Ninja Generators ^^^^^^^^^^^^^^^^ 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: |