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 96de37092a29cb2e7a92e9cb10b0ef47bca32732 (commit)
via 7b637ebdc97655462d08d8ff70bee5d4f32e4681 (commit)
via c2f561e58c799cc82df7db70710ae2f79b8b6b64 (commit)
via 6b84df8da98169af43d4173dfbd1dedf5979dcb2 (commit)
via d7d4083025f3007b862dd500c8f5fc64e105055b (commit)
via b22294bc41c3ce62e561c7123c3f489a750dcb66 (commit)
via b6a3102a9f8da05b50d4f4e96dd9f42ace37aa9b (commit)
via d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2 (commit)
via 504db72d99fc2302de605fd9c2f845c1b8865500 (commit)
via fa6325782112063b5d425714a37c8ebd01b90d7c (commit)
via 6299693f8aa5f5a61cec82215b73a2040a8d8603 (commit)
via 29b51379de352980dd453243bea7ed37ed300c62 (commit)
via 7d9b49fbdf55b28d2979af89a8192607df487ca1 (commit)
via 4389664a26be4d1f96a55c34e5fac9ac1248e5f0 (commit)
via 328191f65f7fb58ece6f749fbfc3462539c7afc1 (commit)
via 9e032304ea4133dd6c59b2c0f3b686d4a7aac2a5 (commit)
via fde59c4d882e104459dbdf8a07a22899427b6657 (commit)
via 52b6effd817ae44577f86df4f382b0c98df7402a (commit)
via 8e0cb45e5591cc778b054780f9e6290c3f239815 (commit)
via d5e7d5f3ebb42e1a8b38e4bd30f717cdac81ed77 (commit)
via 64be1ae4a3ae98e63cf35d495f0ca06c77cdf923 (commit)
via 47866770cee381851ccc8070f64459909a838288 (commit)
via 735f168bf08a4fdf1d9e245035d2dbcadbed652f (commit)
via c148803a575ed1c3639123190b1d6a5d31578f34 (commit)
from ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (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=96de37092a29cb2e7a92e9cb10b0ef47bca32732
commit 96de37092a29cb2e7a92e9cb10b0ef47bca32732
Merge: ccddb45 7b637eb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 24 09:45:50 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 24 09:45:50 2016 -0400
Merge topic 'android-platform-modules'
7b637ebd Android: Add `ANDROID` variable to indicate the target
c2f561e5 Android: Add test cases covering use of the NDK and standalone
toolchains
6b84df8d Help: Document cross compiling for Android
d7d40830 Android: Select the STL type for NDK builds
b22294bc Android: Populate compiler flags for current ABI
b6a3102a Android: Add a CMAKE_BUILD_TYPE default
d1e3cec2 Android: Add Clang -target option for current ABI
504db72d Android: Add placeholders for compiler/abi-specific settings
fa632578 Android: Avoid interfering with common pre-existing toolchain files
6299693f Android: Search for NDK and standalone toolchain in more places
29b51379 Android: Detect and save a standalone toolchain without the NDK
7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set
4389664a Android: Detect and save a toolchain from the NDK
328191f6 Android: Set CMAKE_SYSROOT automatically
9e032304 Android: Detect and save the architecture, ABI, and processor
fde59c4d Android: Detect and save the API level
...
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-toolchains.7.rst | 204 ++++++++++++-
Help/manual/cmake-variables.7.rst | 9 +
Help/prop_tgt/ANDROID_API.rst | 9 +-
Help/prop_tgt/ANDROID_ARCH.rst | 3 +-
Help/prop_tgt/ANDROID_GUI.rst | 4 +-
Help/prop_tgt/ANDROID_STL_TYPE.rst | 32 ++-
Help/release/dev/android-platform-modules.rst | 5 +
Help/variable/ANDROID.rst | 5 +
Help/variable/CMAKE_ANDROID_API.rst | 10 +-
Help/variable/CMAKE_ANDROID_ARCH.rst | 18 +-
Help/variable/CMAKE_ANDROID_ARCH_ABI.rst | 17 ++
Help/variable/CMAKE_ANDROID_ARM_MODE.rst | 7 +
Help/variable/CMAKE_ANDROID_ARM_NEON.rst | 6 +
Help/variable/CMAKE_ANDROID_NDK.rst | 7 +
.../CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst | 13 +
.../CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst | 6 +
Help/variable/CMAKE_ANDROID_STL_TYPE.rst | 35 ++-
.../CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst | 11 +
.../CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst | 7 +
Modules/CMakeCCompiler.cmake.in | 1 +
Modules/CMakeCXXCompiler.cmake.in | 1 +
Modules/CMakeDetermineSystem.cmake | 1 +
Modules/CMakeFortranCompiler.cmake.in | 2 +
Modules/CMakeSystem.cmake.in | 2 +-
Modules/Platform/Android-Clang-C.cmake | 2 +
Modules/Platform/Android-Clang-CXX.cmake | 2 +
Modules/Platform/Android-Clang.cmake | 52 ++++
Modules/Platform/Android-Common.cmake | 158 ++++++++++
Modules/Platform/Android-Determine-C.cmake | 2 +
Modules/Platform/Android-Determine-CXX.cmake | 2 +
Modules/Platform/Android-Determine.cmake | 301 ++++++++++++++++++++
Modules/Platform/Android-GNU-C.cmake | 2 +
Modules/Platform/Android-GNU-CXX.cmake | 2 +
Modules/Platform/Android-GNU.cmake | 43 +++
Modules/Platform/Android-Initialize.cmake | 51 ++++
Modules/Platform/Android.cmake | 2 +
.../Platform/Android/Determine-Compiler-NDK.cmake | 256 +++++++++++++++++
.../Android/Determine-Compiler-Standalone.cmake | 69 +++++
Modules/Platform/Android/Determine-Compiler.cmake | 80 ++++++
Modules/Platform/Android/abi-arm64-v8a-Clang.cmake | 8 +
Modules/Platform/Android/abi-arm64-v8a-GNU.cmake | 6 +
Modules/Platform/Android/abi-armeabi-Clang.cmake | 20 ++
Modules/Platform/Android/abi-armeabi-GNU.cmake | 18 ++
.../Platform/Android/abi-armeabi-v6-Clang.cmake | 19 ++
Modules/Platform/Android/abi-armeabi-v6-GNU.cmake | 17 ++
.../Platform/Android/abi-armeabi-v7a-Clang.cmake | 29 ++
Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake | 27 ++
Modules/Platform/Android/abi-common-Clang.cmake | 6 +
Modules/Platform/Android/abi-common-GNU.cmake | 1 +
Modules/Platform/Android/abi-common.cmake | 4 +
Modules/Platform/Android/abi-mips-Clang.cmake | 8 +
Modules/Platform/Android/abi-mips-GNU.cmake | 6 +
Modules/Platform/Android/abi-mips64-Clang.cmake | 8 +
Modules/Platform/Android/abi-mips64-GNU.cmake | 6 +
Modules/Platform/Android/abi-x86-Clang.cmake | 8 +
Modules/Platform/Android/abi-x86-GNU.cmake | 2 +
Modules/Platform/Android/abi-x86_64-Clang.cmake | 8 +
Modules/Platform/Android/abi-x86_64-GNU.cmake | 2 +
Modules/Platform/Android/ndk-stl-c++.cmake | 13 +
Modules/Platform/Android/ndk-stl-c++_shared.cmake | 4 +
Modules/Platform/Android/ndk-stl-c++_static.cmake | 6 +
Modules/Platform/Android/ndk-stl-gabi++.cmake | 7 +
.../Platform/Android/ndk-stl-gabi++_shared.cmake | 4 +
.../Platform/Android/ndk-stl-gabi++_static.cmake | 4 +
Modules/Platform/Android/ndk-stl-gnustl.cmake | 9 +
.../Platform/Android/ndk-stl-gnustl_shared.cmake | 4 +
.../Platform/Android/ndk-stl-gnustl_static.cmake | 4 +
Modules/Platform/Android/ndk-stl-none.cmake | 2 +
Modules/Platform/Android/ndk-stl-stlport.cmake | 7 +
.../Platform/Android/ndk-stl-stlport_shared.cmake | 4 +
.../Platform/Android/ndk-stl-stlport_static.cmake | 4 +
Modules/Platform/Android/ndk-stl-system.cmake | 6 +
.../BadSYSROOT-result.txt} | 0
Tests/RunCMake/Android/BadSYSROOT-stderr.txt | 20 ++
.../RunCMake/Android/BadSYSROOT.cmake | 0
Tests/RunCMake/Android/CMakeLists.txt | 3 +
Tests/RunCMake/Android/RunCMakeTest.cmake | 218 ++++++++++++++
Tests/RunCMake/Android/android.c | 6 +
Tests/RunCMake/Android/android.cxx | 45 +++
Tests/RunCMake/Android/android.h | 103 +++++++
Tests/RunCMake/Android/common.cmake | 60 ++++
Tests/RunCMake/Android/ndk-arm64-v8a-stdout.txt | 2 +
Tests/RunCMake/Android/ndk-arm64-v8a.cmake | 1 +
Tests/RunCMake/Android/ndk-armeabi-arm-stdout.txt | 3 +
Tests/RunCMake/Android/ndk-armeabi-arm.cmake | 1 +
.../RunCMake/Android/ndk-armeabi-thumb-stdout.txt | 3 +
Tests/RunCMake/Android/ndk-armeabi-thumb.cmake | 1 +
.../Android/ndk-armeabi-v7a-neon-stdout.txt | 3 +
Tests/RunCMake/Android/ndk-armeabi-v7a-neon.cmake | 1 +
Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt | 3 +
Tests/RunCMake/Android/ndk-armeabi-v7a.cmake | 1 +
.../ndk-badabi-result.txt} | 0
Tests/RunCMake/Android/ndk-badabi-stderr.txt | 5 +
.../RunCMake/Android/ndk-badabi.cmake | 0
.../ndk-badarm-result.txt} | 0
Tests/RunCMake/Android/ndk-badarm-stderr.txt | 6 +
.../RunCMake/Android/ndk-badarm.cmake | 0
.../ndk-badneon-result.txt} | 0
Tests/RunCMake/Android/ndk-badneon-stderr.txt | 6 +
.../RunCMake/Android/ndk-badneon.cmake | 0
.../ndk-badstl-result.txt} | 0
Tests/RunCMake/Android/ndk-badstl-stderr.txt | 9 +
Tests/RunCMake/Android/ndk-badstl.cmake | 1 +
.../ndk-badver-result.txt} | 0
Tests/RunCMake/Android/ndk-badver-stderr.txt | 12 +
Tests/RunCMake/Android/ndk-badver.cmake | 1 +
.../ndk-badvernum-result.txt} | 0
Tests/RunCMake/Android/ndk-badvernum-stderr.txt | 13 +
Tests/RunCMake/Android/ndk-badvernum.cmake | 1 +
Tests/RunCMake/Android/ndk-mips-stdout.txt | 2 +
Tests/RunCMake/Android/ndk-mips.cmake | 1 +
Tests/RunCMake/Android/ndk-mips64-stdout.txt | 2 +
Tests/RunCMake/Android/ndk-mips64.cmake | 1 +
.../Android/ndk-sysroot-armeabi-stdout.txt | 1 +
.../RunCMake/Android/ndk-sysroot-armeabi.cmake | 0
Tests/RunCMake/Android/ndk-x86-stdout.txt | 2 +
Tests/RunCMake/Android/ndk-x86.cmake | 1 +
Tests/RunCMake/Android/ndk-x86_64-stdout.txt | 2 +
Tests/RunCMake/Android/ndk-x86_64.cmake | 1 +
Tests/RunCMake/Android/standalone-stdout.txt | 1 +
.../RunCMake/Android/standalone-sysroot-stdout.txt | 1 +
.../RunCMake/Android/standalone-sysroot.cmake | 0
Tests/RunCMake/Android/standalone.cmake | 1 +
Tests/RunCMake/CMakeLists.txt | 21 ++
124 files changed, 2257 insertions(+), 28 deletions(-)
create mode 100644 Help/release/dev/android-platform-modules.rst
create mode 100644 Help/variable/ANDROID.rst
create mode 100644 Help/variable/CMAKE_ANDROID_ARCH_ABI.rst
create mode 100644 Help/variable/CMAKE_ANDROID_ARM_MODE.rst
create mode 100644 Help/variable/CMAKE_ANDROID_ARM_NEON.rst
create mode 100644 Help/variable/CMAKE_ANDROID_NDK.rst
create mode 100644 Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
create mode 100644 Help/variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst
create mode 100644 Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst
create mode 100644 Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst
create mode 100644 Modules/Platform/Android-Clang-C.cmake
create mode 100644 Modules/Platform/Android-Clang-CXX.cmake
create mode 100644 Modules/Platform/Android-Clang.cmake
create mode 100644 Modules/Platform/Android-Common.cmake
create mode 100644 Modules/Platform/Android-Determine-C.cmake
create mode 100644 Modules/Platform/Android-Determine-CXX.cmake
create mode 100644 Modules/Platform/Android-Determine.cmake
create mode 100644 Modules/Platform/Android-GNU-C.cmake
create mode 100644 Modules/Platform/Android-GNU-CXX.cmake
create mode 100644 Modules/Platform/Android-GNU.cmake
create mode 100644 Modules/Platform/Android-Initialize.cmake
create mode 100644 Modules/Platform/Android/Determine-Compiler-NDK.cmake
create mode 100644 Modules/Platform/Android/Determine-Compiler-Standalone.cmake
create mode 100644 Modules/Platform/Android/Determine-Compiler.cmake
create mode 100644 Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-common-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-common-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-common.cmake
create mode 100644 Modules/Platform/Android/abi-mips-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-mips-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-mips64-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-mips64-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-x86-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-x86-GNU.cmake
create mode 100644 Modules/Platform/Android/abi-x86_64-Clang.cmake
create mode 100644 Modules/Platform/Android/abi-x86_64-GNU.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-c++.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-c++_shared.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-c++_static.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gabi++.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gabi++_static.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gnustl.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-gnustl_static.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-none.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-stlport.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-stlport_shared.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-stlport_static.cmake
create mode 100644 Modules/Platform/Android/ndk-stl-system.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/BadSYSROOT-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/BadSYSROOT-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/BadSYSROOT.cmake (100%)
create mode 100644 Tests/RunCMake/Android/CMakeLists.txt
create mode 100644 Tests/RunCMake/Android/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/Android/android.c
create mode 100644 Tests/RunCMake/Android/android.cxx
create mode 100644 Tests/RunCMake/Android/android.h
create mode 100644 Tests/RunCMake/Android/common.cmake
create mode 100644 Tests/RunCMake/Android/ndk-arm64-v8a-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-arm64-v8a.cmake
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-arm-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-arm.cmake
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-thumb-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-thumb.cmake
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-v7a-neon-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-v7a-neon.cmake
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-armeabi-v7a.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badabi-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badabi-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/ndk-badabi.cmake (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badarm-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badarm-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/ndk-badarm.cmake (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badneon-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badneon-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/ndk-badneon.cmake (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badstl-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badstl-stderr.txt
create mode 100644 Tests/RunCMake/Android/ndk-badstl.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badver-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badver-stderr.txt
create mode 100644 Tests/RunCMake/Android/ndk-badver.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Android/ndk-badvernum-result.txt} (100%)
create mode 100644 Tests/RunCMake/Android/ndk-badvernum-stderr.txt
create mode 100644 Tests/RunCMake/Android/ndk-badvernum.cmake
create mode 100644 Tests/RunCMake/Android/ndk-mips-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-mips.cmake
create mode 100644 Tests/RunCMake/Android/ndk-mips64-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-mips64.cmake
create mode 100644 Tests/RunCMake/Android/ndk-sysroot-armeabi-stdout.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/ndk-sysroot-armeabi.cmake (100%)
create mode 100644 Tests/RunCMake/Android/ndk-x86-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-x86.cmake
create mode 100644 Tests/RunCMake/Android/ndk-x86_64-stdout.txt
create mode 100644 Tests/RunCMake/Android/ndk-x86_64.cmake
create mode 100644 Tests/RunCMake/Android/standalone-stdout.txt
create mode 100644 Tests/RunCMake/Android/standalone-sysroot-stdout.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/Android/standalone-sysroot.cmake (100%)
create mode 100644 Tests/RunCMake/Android/standalone.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
