[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1043-gb668274

[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  b66827462430f64b059891aa40240690fc0b4139 (commit)
       via  78469c201fa70ec7ac03e7bde61b336af7bad90e (commit)
      from  d2d657f0c95267224b74ed17a93e31ca89d4ca4c (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=b66827462430f64b059891aa40240690fc0b4139
commit b66827462430f64b059891aa40240690fc0b4139
Merge: d2d657f 78469c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 14 14:24:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 14 14:24:02 2015 -0400

    Merge topic 'vs-nsight-tegra-attributes' into next
    
    78469c20 fixup! VS: Add more Nsight Tegra generator Android property settings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78469c201fa70ec7ac03e7bde61b336af7bad90e
commit 78469c201fa70ec7ac03e7bde61b336af7bad90e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 14 14:23:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 14 14:23:52 2015 -0400

    fixup! VS: Add more Nsight Tegra generator Android property settings

diff --git a/Help/prop_tgt/ANDROID_ARCH.rst b/Help/prop_tgt/ANDROID_ARCH.rst
index 03fb5ec..5477fb5 100644
--- a/Help/prop_tgt/ANDROID_ARCH.rst
+++ b/Help/prop_tgt/ANDROID_ARCH.rst
@@ -5,11 +5,12 @@ Set the Android target architecture.
 
 This is a string property that could be set to the one of
 the following values:
-``armv7-a``      e.g. "ARMv7-A (armv7-a)"
-``armv7-a-hard`` e.g. "ARMv7-A, hard-float ABI (armv7-a)"
-``arm64-v8a``    e.g. "ARMv8-A, 64bit (arm64-v8a)"
-``x86``          e.g. "x86 (x86)"
-``x86_64``       e.g. "x86_64 (x86_64)"
+
+* ``armv7-a``: "ARMv7-A (armv7-a)"
+* ``armv7-a-hard``: "ARMv7-A, hard-float ABI (armv7-a)"
+* ``arm64-v8a``: "ARMv8-A, 64bit (arm64-v8a)"
+* ``x86``: "x86 (x86)"
+* ``x86_64``: "x86_64 (x86_64)"
 
 This property is initialized by the value of the
 :variable:`CMAKE_ANDROID_ARCH` variable if it is set

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

Summary of changes:
 Help/prop_tgt/ANDROID_ARCH.rst |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake