diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-11 19:50:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-18 14:51:17 (GMT) |
| commit | 790c0a89de5a06e52a5f71b372e70ed0b36194cd (patch) | |
| tree | 55a8ac27514d5c1a12f7f36970849a4bf13649a9 /Help | |
| parent | 5cfc2e926af645840c6a0464451af18f08528879 (diff) | |
| download | CMake-790c0a89de5a06e52a5f71b372e70ed0b36194cd.zip CMake-790c0a89de5a06e52a5f71b372e70ed0b36194cd.tar.gz CMake-790c0a89de5a06e52a5f71b372e70ed0b36194cd.tar.bz2 | |
Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
When this variable is not set by the user or toolchain file, set it to
the default selected. This will be useful for client code that needs to
pass the value to an external tool that needs to find the same toolchain
in the NDK. Leave it empty for a standalone toolchain.
Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/android-info-variables.rst | 6 | ||||
| -rw-r--r-- | Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst index 74eab2d..64abe9a 100644 --- a/Help/manual/cmake-toolchains.7.rst +++ b/Help/manual/cmake-toolchains.7.rst @@ -387,7 +387,7 @@ Configure use of an Android NDK with the following variables: :variable:`CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION` Set to the version of the NDK toolchain to be selected as the compiler. - If not specified, the latest available GCC toolchain will be used. + If not specified, the default will be the latest available GCC toolchain. :variable:`CMAKE_ANDROID_STL_TYPE` Set to specify which C++ standard library to use. If not specified, diff --git a/Help/release/dev/android-info-variables.rst b/Help/release/dev/android-info-variables.rst new file mode 100644 index 0000000..089f9b0 --- /dev/null +++ b/Help/release/dev/android-info-variables.rst @@ -0,0 +1,6 @@ +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. diff --git a/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst b/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst index dff7d64..5ae55d1 100644 --- a/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst +++ b/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst @@ -11,3 +11,6 @@ as the compiler. The variable must be set to one of these forms: A toolchain of the requested version will be selected automatically to match the ABI named in the :variable:`CMAKE_ANDROID_ARCH_ABI` variable. + +If not specified, the default will be a value that selects the latest +available GCC toolchain. |