This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 0e9634d2c90fd748774f9238219cb1661550f233 (commit)
via f7c5e970a0b9697ecdb443aecdee87b51e0a5457 (commit)
via d95e6dff3cb869d45b27836dc0967ab27872bcdc (commit)
via 3d42a72bd5827ea875bbba830ecff90b3aaf54d6 (commit)
from e67a59b00d08b426272c86771690782e5cc7f97f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e9634d2c90fd748774f9238219cb1661550f233
commit 0e9634d2c90fd748774f9238219cb1661550f233
Merge: e67a59b f7c5e97
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 17 09:40:32 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Nov 17 09:40:32 2016 -0500
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
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-toolchains.7.rst | 2 +-
Help/manual/cmake-variables.7.rst | 2 ++
Help/release/dev/android-info-variables.rst | 15 +++++++++
.../CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst | 6 ++++
.../CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst | 3 ++
.../CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst | 9 ++++++
.../CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst | 3 +-
.../CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst | 3 +-
.../Platform/Android/Determine-Compiler-NDK.cmake | 17 ++++++++--
.../Android/Determine-Compiler-Standalone.cmake | 7 ++++
Modules/Platform/Android/Determine-Compiler.cmake | 7 ++++
Tests/RunCMake/Android/common.cmake | 34 +++++++++++++++++++-
12 files changed, 102 insertions(+), 6 deletions(-)
create mode 100644 Help/release/dev/android-info-variables.rst
create mode 100644 Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
create mode 100644 Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
