summaryrefslogtreecommitdiffstats
path: root/Help/manual/cmake-toolchains.7.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-07-15 13:05:49 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-07-15 13:05:49 (GMT)
commit5bd01a4b695e68efb5e6c91fb726d160ef911aec (patch)
treec2351eede061f454fd74951e176102c46bd82174 /Help/manual/cmake-toolchains.7.rst
parent27373f550e13b032803873348057b0e80b0c0086 (diff)
parent8c0afaf45098dccaee51b50b40593ffb67c3e42a (diff)
downloadCMake-5bd01a4b695e68efb5e6c91fb726d160ef911aec.zip
CMake-5bd01a4b695e68efb5e6c91fb726d160ef911aec.tar.gz
CMake-5bd01a4b695e68efb5e6c91fb726d160ef911aec.tar.bz2
Merge topic 'vs-nsight-tegra-attributes'
8c0afaf4 VS: Add more Nsight Tegra generator Android property settings
Diffstat (limited to 'Help/manual/cmake-toolchains.7.rst')
-rw-r--r--Help/manual/cmake-toolchains.7.rst22
1 files changed, 19 insertions, 3 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 054438d..a06dce7 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -256,6 +256,22 @@ like this:
The :variable:`CMAKE_GENERATOR_TOOLSET` may be set to select
the Nsight Tegra "Toolchain Version" value.
-See the :prop_tgt:`ANDROID_API_MIN`, :prop_tgt:`ANDROID_API`
-and :prop_tgt:`ANDROID_GUI` target properties to configure
-targets within the project.
+See also target properties:
+
+* :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+* :prop_tgt:`ANDROID_API_MIN`
+* :prop_tgt:`ANDROID_API`
+* :prop_tgt:`ANDROID_ARCH`
+* :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+* :prop_tgt:`ANDROID_GUI`
+* :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+* :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+* :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+* :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+* :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+* :prop_tgt:`ANDROID_PROCESS_MAX`
+* :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+* :prop_tgt:`ANDROID_PROGUARD`
+* :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+* :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+* :prop_tgt:`ANDROID_STL_TYPE`