diff options
author | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:22 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:22 (GMT) |
commit | 206117af1723a565df4c39feb999b48e8f91f3b3 (patch) | |
tree | 4a5ea7aca1c6e743a00373b54dcf321032a5dcf9 | |
parent | 17e1ead25eeed3fd8f9c2dbeea25698210180a8e (diff) | |
parent | 23e2bd7e8cd69eeb6bc607a0b62c764567ac3c5f (diff) | |
download | CMake-206117af1723a565df4c39feb999b48e8f91f3b3.zip CMake-206117af1723a565df4c39feb999b48e8f91f3b3.tar.gz CMake-206117af1723a565df4c39feb999b48e8f91f3b3.tar.bz2 |
Merge branch 'doc-Nsight-Tegra-toolchain' into release
-rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 17 | ||||
-rw-r--r-- | Help/prop_tgt/ANDROID_GUI.rst | 4 |
2 files changed, 21 insertions, 0 deletions
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. |