diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-17 14:40:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-17 14:40:32 (GMT) |
| commit | 0e9634d2c90fd748774f9238219cb1661550f233 (patch) | |
| tree | 4852c1af8fce4acfa78851746ee1838717900ae2 /Help/manual/cmake-variables.7.rst | |
| parent | e67a59b00d08b426272c86771690782e5cc7f97f (diff) | |
| parent | f7c5e970a0b9697ecdb443aecdee87b51e0a5457 (diff) | |
| download | CMake-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/manual/cmake-variables.7.rst')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 93e809a..d68265d 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -244,6 +244,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 @@ -354,6 +355,7 @@ Variables for Languages /variable/CMAKE_Fortran_MODDIR_FLAG /variable/CMAKE_Fortran_MODOUT_FLAG /variable/CMAKE_INTERNAL_PLATFORM_ABI + /variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE /variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX /variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX /variable/CMAKE_LANG_ARCHIVE_APPEND |