summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-17 14:40:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-17 14:40:32 (GMT)
commit0e9634d2c90fd748774f9238219cb1661550f233 (patch)
tree4852c1af8fce4acfa78851746ee1838717900ae2 /Help/release
parente67a59b00d08b426272c86771690782e5cc7f97f (diff)
parentf7c5e970a0b9697ecdb443aecdee87b51e0a5457 (diff)
downloadCMake-0e9634d2c90fd748774f9238219cb1661550f233.zip
CMake-0e9634d2c90fd748774f9238219cb1661550f233.tar.gz
CMake-0e9634d2c90fd748774f9238219cb1661550f233.tar.bz2
Merge topic 'android-info-variables'
f7c5e970 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE d95e6dff Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 3d42a72b Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
Diffstat (limited to 'Help/release')
-rw-r--r--Help/release/dev/android-info-variables.rst15
1 files changed, 15 insertions, 0 deletions
diff --git a/Help/release/dev/android-info-variables.rst b/Help/release/dev/android-info-variables.rst
new file mode 100644
index 0000000..e173342
--- /dev/null
+++ b/Help/release/dev/android-info-variables.rst
@@ -0,0 +1,15 @@
+android-info-variables
+----------------------
+
+* When :ref:`Cross Compiling for Android`, a new
+ :variable:`CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE` variable is
+ now set to indicate the binutils' machine name.
+
+* When :ref:`Cross Compiling for Android with the NDK`, the
+ :variable:`CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION` variable is
+ now set by CMake if it is not set by the user or toolchain file.
+
+* When :ref:`Cross Compiling for Android with the NDK`, a new
+ :variable:`CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG` variable is
+ now set by CMake to expose the host directory component of the
+ path to the NDK prebuilt toolchains.