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 34d035e70e3ef3f79212bd8c5b5d36250090d856 (commit)
via df84281d68a715658ce0068c0869dd80831cd4a7 (commit)
via 69e198dc3fd0e0d16a7b4fe5bcda4c6e1e77ea2f (commit)
via 5365c9ac377ab6f579a1af32c4bfbec798417efb (commit)
via 178f56a57996651a4f8c2a20271f1e2c999279d2 (commit)
via 7115702f1b116fcf9b82ab197bab7426db10c610 (commit)
via a62894998f59d87e092a664ea50e33ff8dbb180c (commit)
via c12e46991e02c2ea59864512d2c1fb7c2b4b0f9d (commit)
via 9a4df52aa1f6736c2eceebd109240441bc3a4d6e (commit)
via 16569abfa83ce231b1270282f03aae0b4542c42d (commit)
via ef0fd4f0ced850edd049bb05b527c3bd234f441f (commit)
via d09b60f563902bd2197d88a3e83b119c09e62428 (commit)
via 2f071466ebd4e3a416a523ac5f17c84543ff8b3c (commit)
from 026c4a5d1b3ac3297b7a205d779cfcff6f74a67a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34d035e70e3ef3f79212bd8c5b5d36250090d856
commit 34d035e70e3ef3f79212bd8c5b5d36250090d856
Merge: 026c4a5 df84281
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 30 08:46:27 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 30 08:46:27 2014 -0400
Merge topic 'vs-nsight-tegra-generator'
df84281d Help: Add notes for topic 'vs-nsight-tegra-generator'
69e198dc VS: Generate Nsight Tegra project revision number
5365c9ac VS: Map Nsight Tegra file types in .vcxproj files
178f56a5 VS: Fix Tegra-Android platform linking of libraries by name
7115702f Tests: Add test for VS Nsight Tegra generator support
a6289499 VS: Generate ANDROID_GUI executables as app packages
c12e4699 Add 'ANDROID_API' target property to set Android Target API
9a4df52a Add 'ANDROID_GUI' target property to mark Android applications
16569abf cmTarget: Track internally whether platform is Android
ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform
d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains
2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 2 +
Help/manual/cmake-variables.7.rst | 3 +
Help/prop_tgt/ANDROID_API.rst | 7 +
Help/prop_tgt/ANDROID_GUI.rst | 9 ++
Help/release/dev/vs-nsight-tegra-generator.rst | 8 +
Help/variable/CMAKE_ANDROID_API.rst | 5 +
Help/variable/CMAKE_ANDROID_GUI.rst | 5 +
Help/variable/CMAKE_VS_NsightTegra_VERSION.rst | 7 +
Modules/CMakeDetermineCompilerId.cmake | 22 ++-
Modules/CMakeFindBinUtils.cmake | 3 +-
...{VS-10.vcxproj.in => VS-NsightTegra.vcxproj.in} | 37 ++---
Modules/Platform/Android.cmake | 6 +
Source/cmGlobalVisualStudio10Generator.cxx | 47 ++++++
Source/cmGlobalVisualStudio10Generator.h | 7 +
Source/cmTarget.cxx | 23 ++-
Source/cmTarget.h | 1 +
Source/cmVisualStudio10TargetGenerator.cxx | 155 +++++++++++++++++++-
Source/cmVisualStudio10TargetGenerator.h | 4 +
Tests/CMakeLists.txt | 28 +++-
Tests/VSNsightTegra/AndroidManifest.xml | 16 ++
Tests/VSNsightTegra/CMakeLists.txt | 39 +++++
Tests/VSNsightTegra/build.xml | 4 +
Tests/VSNsightTegra/jni/first.c | 22 +++
Tests/VSNsightTegra/jni/first.h | 22 +++
Tests/VSNsightTegra/jni/second.c | 27 ++++
Tests/VSNsightTegra/res/values/strings.xml | 4 +
.../src/com/example/twolibs/TwoLibs.java | 46 ++++++
27 files changed, 530 insertions(+), 29 deletions(-)
create mode 100644 Help/prop_tgt/ANDROID_API.rst
create mode 100644 Help/prop_tgt/ANDROID_GUI.rst
create mode 100644 Help/release/dev/vs-nsight-tegra-generator.rst
create mode 100644 Help/variable/CMAKE_ANDROID_API.rst
create mode 100644 Help/variable/CMAKE_ANDROID_GUI.rst
create mode 100644 Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
copy Modules/CompilerId/{VS-10.vcxproj.in => VS-NsightTegra.vcxproj.in} (67%)
create mode 100644 Tests/VSNsightTegra/AndroidManifest.xml
create mode 100644 Tests/VSNsightTegra/CMakeLists.txt
create mode 100644 Tests/VSNsightTegra/build.xml
create mode 100644 Tests/VSNsightTegra/jni/first.c
create mode 100644 Tests/VSNsightTegra/jni/first.h
create mode 100644 Tests/VSNsightTegra/jni/second.c
create mode 100644 Tests/VSNsightTegra/res/values/strings.xml
create mode 100644 Tests/VSNsightTegra/src/com/example/twolibs/TwoLibs.java
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
