diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-06 19:48:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-06 19:52:49 (GMT) |
| commit | 67c4be51a34f86d4c26fa9f1f2f79f5539493eee (patch) | |
| tree | e44eefd24b5b5b6931c3783b911e62e5be77f9af /Modules/FindCUDA.cmake | |
| parent | 917da5d02766e875ec63eca09eb52b789114674c (diff) | |
| parent | 79349ed8fc22f70de7f839b2323cf3e93aca9bc9 (diff) | |
| download | CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.zip CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.gz CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.bz2 | |
Merge branch 'release-doc-formatting' into doc-formatting
Resolve conflict in Modules/ExternalProject.cmake by keeping our side,
which is more completely revised.
Diffstat (limited to 'Modules/FindCUDA.cmake')
| -rw-r--r-- | Modules/FindCUDA.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 3dd975c..29bb875 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -278,13 +278,13 @@ # Only available for CUDA version 3.2+. # CUDA_cusparse_LIBRARY -- CUDA Sparse Matrix library. # Only available for CUDA version 3.2+. -# CUDA_npp_LIBRARY -- NVIDIA Performance Primitives library. +# CUDA_npp_LIBRARY -- NVIDIA Performance Primitives lib. # Only available for CUDA version 4.0+. -# CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives library (core). +# CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives lib (core). # Only available for CUDA version 5.5+. -# CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives library (image processing). +# CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives lib (image processing). # Only available for CUDA version 5.5+. -# CUDA_npps_LIBRARY -- NVIDIA Performance Primitives library (signal processing). +# CUDA_npps_LIBRARY -- NVIDIA Performance Primitives lib (signal processing). # Only available for CUDA version 5.5+. # CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library. # Only available for CUDA version 3.2+. |