[Cmake-commits] CMake branch, master, updated. v3.3.0-rc4-457-g5bd01a4

[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, master has been updated
       via  5bd01a4b695e68efb5e6c91fb726d160ef911aec (commit)
       via  8c0afaf45098dccaee51b50b40593ffb67c3e42a (commit)
      from  27373f550e13b032803873348057b0e80b0c0086 (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=5bd01a4b695e68efb5e6c91fb726d160ef911aec
commit 5bd01a4b695e68efb5e6c91fb726d160ef911aec
Merge: 27373f5 8c0afaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 09:05:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 15 09:05:49 2015 -0400

    Merge topic 'vs-nsight-tegra-attributes'
    
    8c0afaf4 VS: Add more Nsight Tegra generator Android property settings


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |   14 ++
 Help/manual/cmake-toolchains.7.rst                 |   22 ++-
 Help/manual/cmake-variables.7.rst                  |   14 ++
 Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst   |    8 ++
 Help/prop_tgt/ANDROID_ARCH.rst                     |   17 +++
 Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst       |    9 ++
 Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst         |    7 +
 Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst          |   14 ++
 Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst          |    8 ++
 Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst  |   14 ++
 Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst   |   16 +++
 Help/prop_tgt/ANDROID_PROCESS_MAX.rst              |    8 ++
 Help/prop_tgt/ANDROID_PROGUARD.rst                 |    9 ++
 Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst     |    9 ++
 Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst        |    8 ++
 Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst            |    6 +
 Help/prop_tgt/ANDROID_STL_TYPE.rst                 |   15 +++
 Help/release/dev/vs-nsight-tegra-attributes.rst    |   21 +++
 .../CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst       |    5 +
 Help/variable/CMAKE_ANDROID_ARCH.rst               |    5 +
 Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst |    5 +
 Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst   |    5 +
 Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst    |    5 +
 Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst    |    5 +
 .../CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst      |    5 +
 .../CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst       |    5 +
 Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst        |    5 +
 Help/variable/CMAKE_ANDROID_PROGUARD.rst           |    5 +
 .../CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst         |    5 +
 Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst  |    5 +
 Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst      |    5 +
 Help/variable/CMAKE_ANDROID_STL_TYPE.rst           |    5 +
 Source/cmTarget.cxx                                |   14 ++
 Source/cmVisualStudio10TargetGenerator.cxx         |  141 +++++++++++++++++++-
 Tests/VSNsightTegra/CMakeLists.txt                 |   19 ++-
 Tests/VSNsightTegra/proguard-android.txt           |   57 ++++++++
 36 files changed, 510 insertions(+), 10 deletions(-)
 create mode 100644 Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 create mode 100644 Help/prop_tgt/ANDROID_ARCH.rst
 create mode 100644 Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst
 create mode 100644 Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROCESS_MAX.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROGUARD.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst
 create mode 100644 Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst
 create mode 100644 Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst
 create mode 100644 Help/prop_tgt/ANDROID_STL_TYPE.rst
 create mode 100644 Help/release/dev/vs-nsight-tegra-attributes.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ARCH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROGUARD.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_STL_TYPE.rst
 create mode 100644 Tests/VSNsightTegra/proguard-android.txt


hooks/post-receive
-- 
CMake