summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-04-10 15:31:25 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-04-10 15:31:42 (GMT)
commit9fabee00ca8d3f15a05ac3216b755e27843f2fac (patch)
tree1a144c8678de30639fb543cf2a701a9f06f19391
parente769e61f992ba0c0028e28bdf7531f495a625925 (diff)
parent4a127b78fd44fd3f05eade253051b9e56a1082fc (diff)
downloadCMake-9fabee00ca8d3f15a05ac3216b755e27843f2fac.zip
CMake-9fabee00ca8d3f15a05ac3216b755e27843f2fac.tar.gz
CMake-9fabee00ca8d3f15a05ac3216b755e27843f2fac.tar.bz2
Merge topic 'doc-install-export-android'
4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1943
-rw-r--r--Help/command/install.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst
index eb7b07c..e9c185c 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -339,12 +339,12 @@ Installing Exports
install(EXPORT <export-name> DESTINATION <dir>
[NAMESPACE <namespace>] [[FILE <name>.cmake]|
- [EXPORT_ANDROID_MK <name>.mk]]
[PERMISSIONS permissions...]
[CONFIGURATIONS [Debug|Release|...]]
[EXPORT_LINK_INTERFACE_LIBRARIES]
[COMPONENT <component>]
[EXCLUDE_FROM_ALL])
+ install(EXPORT_ANDROID_MK <export-name> DESTINATION <dir> [...])
The ``EXPORT`` form generates and installs a CMake file containing code to
import targets from the installation tree into another project.
@@ -367,8 +367,9 @@ specified that does not match that given to the targets associated with
included in the export but a target to which it links is not included
the behavior is unspecified.
-In addition to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe
-used to specify an export to the android ndk build system. The Android
+In addition to cmake language files, the ``EXPORT_ANDROID_MK`` mode maybe
+used to specify an export to the android ndk build system. This mode
+accepts the same options as the normal export mode. The Android
NDK supports the use of prebuilt libraries, both static and shared. This
allows cmake to build the libraries of a project and make them available
to an ndk build system complete with transitive dependencies, include flags
@@ -385,7 +386,7 @@ and installed by the current project. For example, the code
will install the executable myexe to ``<prefix>/bin`` and code to import
it in the file ``<prefix>/lib/myproj/myproj.cmake`` and
-``<prefix>/lib/share/ndk-modules/Android.mk``. An outside project
+``<prefix>/share/ndk-modules/Android.mk``. An outside project
may load this file with the include command and reference the ``myexe``
executable from the installation tree using the imported target name
``mp_myexe`` as if the target were built in its own tree.