diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-03 13:32:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-03 13:34:46 (GMT) |
| commit | cee20ad5374e2547cad9f2847006cf753c301042 (patch) | |
| tree | 46f5114f0f2db7b2ad9da463e52f21c05c51ee2c /Help/manual | |
| parent | d8e323761152dcf494606ca3436637a9cbbe1741 (diff) | |
| parent | 25f29b974182ae7da36ace86e846b4c0b2807a68 (diff) | |
| download | CMake-cee20ad5374e2547cad9f2847006cf753c301042.zip CMake-cee20ad5374e2547cad9f2847006cf753c301042.tar.gz CMake-cee20ad5374e2547cad9f2847006cf753c301042.tar.bz2 | |
Merge topic 'vs-cuda-custom-dir'
25f29b9741 cuda: Adapted tests to work with modified cuda toolset
ee86770a3f cuda: Added docs for extended cuda toolset
0ad180d712 cuda: Extend cuda compiler detection to work with custom cuda path
55b0532128 cuda: Extend vs10 target generator to use custom cuda path
df0247a371 cuda: Extend toolset argument to accept path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3713
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 0ae1ebe..08e2de4 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -112,6 +112,7 @@ Variables that Provide Information /variable/CMAKE_VS_PLATFORM_NAME_DEFAULT /variable/CMAKE_VS_PLATFORM_TOOLSET /variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA + /variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR /variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE /variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION |