[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1026-g4ba9e0c

[Brad King]

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, next has been updated
       via  4ba9e0cbf0e93f200535e6c20e71728390d2b8af (commit)
       via  23e2bd7e8cd69eeb6bc607a0b62c764567ac3c5f (commit)
      from  8dc17dc8b327aff448a1e637177f5c6d51b572f9 (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=4ba9e0cbf0e93f200535e6c20e71728390d2b8af
commit 4ba9e0cbf0e93f200535e6c20e71728390d2b8af
Merge: 8dc17dc 23e2bd7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 15:13:43 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 15:13:43 2014 -0500

    Merge topic 'doc-Nsight-Tegra-toolchain' into next
    
    23e2bd7e Help: Document Nsight Tegra toolchain configuration (#15276)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23e2bd7e8cd69eeb6bc607a0b62c764567ac3c5f
commit 23e2bd7e8cd69eeb6bc607a0b62c764567ac3c5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 14:40:25 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 2 14:40:25 2014 -0500

    Help: Document Nsight Tegra toolchain configuration (#15276)

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index afc8ba2..44ffb3b 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -241,3 +241,20 @@ Windows Store may look like this:
 
   set(CMAKE_SYSTEM_NAME WindowsStore)
   set(CMAKE_SYSTEM_VERSION 8.1)
+
+Cross Compiling using NVIDIA Nsight Tegra
+-----------------------------------------
+
+A toolchain file to configure a Visual Studio generator to
+build using NVIDIA Nsight Tegra targeting Android may look
+like this:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME Android)
+
+The :variable:`CMAKE_GENERATOR_TOOLSET` may be set to select
+the Nsight Tegra "Toolchain Version" value.
+
+See the :prop_tgt:`ANDROID_API` and :prop_tgt:`ANDROID_GUI`
+target properties to configure targets within the project.
diff --git a/Help/prop_tgt/ANDROID_GUI.rst b/Help/prop_tgt/ANDROID_GUI.rst
index 90d2428..abdba7a 100644
--- a/Help/prop_tgt/ANDROID_GUI.rst
+++ b/Help/prop_tgt/ANDROID_GUI.rst
@@ -7,3 +7,7 @@ When this property is set to true the executable when built for Android
 will be created as an application package.  This property is initialized
 by the value of the :variable:`CMAKE_ANDROID_GUI` variable if it is set
 when a target is created.
+
+Add the ``AndroidManifest.xml`` source file explicitly to the
+target :command:`add_executable` command invocation to specify the
+root directory of the application package source.

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-toolchains.7.rst |   17 +++++++++++++++++
 Help/prop_tgt/ANDROID_GUI.rst      |    4 ++++
 2 files changed, 21 insertions(+)


hooks/post-receive
-- 
CMake