summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-14 12:56:19 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-14 12:56:19 (GMT)
commitb93623550dceac981aa4cc49f9e892c497aee49a (patch)
tree3b996cd7de25624e2157237cc88bca92a5ffa89f /Help/release
parent35e3836589535bae12208a403011c7e95e589a85 (diff)
parent42ce9f1e7178b3535726c0c885cc7c9f760cc8b6 (diff)
downloadCMake-b93623550dceac981aa4cc49f9e892c497aee49a.zip
CMake-b93623550dceac981aa4cc49f9e892c497aee49a.tar.gz
CMake-b93623550dceac981aa4cc49f9e892c497aee49a.tar.bz2
Merge topic 'add_androidmk_generator'
42ce9f1e Add support for creating prebuilt Android.mk files d5257063 Export: Virtualize file generation step helpers f81b9475 Export: Factor out file generation steps into helpers
Diffstat (limited to 'Help/release')
-rw-r--r--Help/release/dev/add_androidmk_generator.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/Help/release/dev/add_androidmk_generator.rst b/Help/release/dev/add_androidmk_generator.rst
new file mode 100644
index 0000000..dd7867c
--- /dev/null
+++ b/Help/release/dev/add_androidmk_generator.rst
@@ -0,0 +1,10 @@
+add_androidmk_generator
+-----------------------
+
+* The :command:`install` command gained an ``EXPORT_ANDROID_MK``
+ subcommand to install ``Android.mk`` files referencing installed
+ libraries as prebuilts for the Android NDK build system.
+
+* The :command:`export` command gained an ``ANDROID_MK`` option
+ to generate ``Android.mk`` files referencing CMake-built
+ libraries as prebuilts for the Android NDK build system.