summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-11 20:22:43 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-18 14:51:18 (GMT)
commit5c2100e5c0be11a8dda8694be214a59e15766857 (patch)
tree49454bec6d6b40f7d8f8f4d3328f9d1afca6adb0 /Help
parent790c0a89de5a06e52a5f71b372e70ed0b36194cd (diff)
downloadCMake-5c2100e5c0be11a8dda8694be214a59e15766857.zip
CMake-5c2100e5c0be11a8dda8694be214a59e15766857.tar.gz
CMake-5c2100e5c0be11a8dda8694be214a59e15766857.tar.bz2
Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/release/dev/android-info-variables.rst5
-rw-r--r--Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst6
3 files changed, 12 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index b74f867..0b28c73 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -241,6 +241,7 @@ Variables that Control the Build
/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES
/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES
/variable/CMAKE_ANDROID_NDK
+ /variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG
/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
/variable/CMAKE_ANDROID_PROCESS_MAX
/variable/CMAKE_ANDROID_PROGUARD
diff --git a/Help/release/dev/android-info-variables.rst b/Help/release/dev/android-info-variables.rst
index 089f9b0..9330c62 100644
--- a/Help/release/dev/android-info-variables.rst
+++ b/Help/release/dev/android-info-variables.rst
@@ -4,3 +4,8 @@ android-info-variables
* 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.
diff --git a/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst b/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
new file mode 100644
index 0000000..207019a
--- /dev/null
+++ b/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
@@ -0,0 +1,6 @@
+CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG
+------------------------------------
+
+When :ref:`Cross Compiling for Android with the NDK`, this variable
+provides the NDK's "host tag" used to construct the path to prebuilt
+toolchains that run on the host.