summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-24 13:45:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-24 13:45:50 (GMT)
commit96de37092a29cb2e7a92e9cb10b0ef47bca32732 (patch)
treeddaacef7de12a87abd0e5c446cde824290076828 /Help/release
parentccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (diff)
parent7b637ebdc97655462d08d8ff70bee5d4f32e4681 (diff)
downloadCMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.zip
CMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.tar.gz
CMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.tar.bz2
Merge topic 'android-platform-modules'
7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ...
Diffstat (limited to 'Help/release')
-rw-r--r--Help/release/dev/android-platform-modules.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Help/release/dev/android-platform-modules.rst b/Help/release/dev/android-platform-modules.rst
new file mode 100644
index 0000000..79ae992
--- /dev/null
+++ b/Help/release/dev/android-platform-modules.rst
@@ -0,0 +1,5 @@
+android-platform-modules
+------------------------
+
+* CMake now supports :ref:`Cross Compiling for Android` with simple
+ toolchain files.