summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-18 14:59:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-18 14:59:54 (GMT)
commit43f292ab34ea403b3f354b8e2c6fa04b2ff9da7d (patch)
tree313b67155299e40909408f94b0410f14517ff487 /Help
parent8ee3909ea67e507cfac8bd070e49f98ac3624735 (diff)
parent78db709062e83f862d97db960f5840404f48266e (diff)
downloadCMake-43f292ab34ea403b3f354b8e2c6fa04b2ff9da7d.zip
CMake-43f292ab34ea403b3f354b8e2c6fa04b2ff9da7d.tar.gz
CMake-43f292ab34ea403b3f354b8e2c6fa04b2ff9da7d.tar.bz2
Merge topic 'backport-android-info-variables'
78db7090 Help: Drop release notes for backported Android variables
Diffstat (limited to 'Help')
-rw-r--r--Help/release/dev/android-info-variables.rst15
1 files changed, 0 insertions, 15 deletions
diff --git a/Help/release/dev/android-info-variables.rst b/Help/release/dev/android-info-variables.rst
deleted file mode 100644
index e173342..0000000
--- a/Help/release/dev/android-info-variables.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-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.