[Cmake-commits] CMake branch, next, updated. v2.8.12-3863-g08ec9ce

[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, next has been updated
       via  08ec9ce928ce3f8891cf9c441402221f979f3a86 (commit)
       via  50762188e1b0402a6a82199dc91760448960bc6c (commit)
      from  d0c3d9aa946837bb9a5a06aaf88bfc42a40924bd (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=08ec9ce928ce3f8891cf9c441402221f979f3a86
commit 08ec9ce928ce3f8891cf9c441402221f979f3a86
Merge: d0c3d9a 5076218
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 11 08:46:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 11 08:46:45 2013 -0400

    Merge topic 'FindCUDA-NPP-5.5' into next
    
    5076218 FindCUDA: Fix NPP library search for CUDA 5.5


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50762188e1b0402a6a82199dc91760448960bc6c
commit 50762188e1b0402a6a82199dc91760448960bc6c
Author:     Vladislav Vinogradov <vlad.vinogradov at itseez.com>
AuthorDate: Tue Oct 8 11:22:45 2013 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 11 08:41:45 2013 -0400

    FindCUDA: Fix NPP library search for CUDA 5.5
    
    In CUDA 5.5 NPP was divided onto 3 separate libraries: nppc, npps, nppi.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 8270ad4..2705d32 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -263,6 +263,12 @@
 #                           Only available for CUDA version 3.2+.
 #  CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives library.
 #                           Only available for CUDA version 4.0+.
+#  CUDA_nppc_LIBRARY      -- NVIDIA Performance Primitives library (core).
+#                           Only available for CUDA version 5.5+.
+#  CUDA_nppi_LIBRARY      -- NVIDIA Performance Primitives library (image processing).
+#                           Only available for CUDA version 5.5+.
+#  CUDA_npps_LIBRARY      -- NVIDIA Performance Primitives library (signal processing).
+#                           Only available for CUDA version 5.5+.
 #  CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
 #                           Only available for CUDA version 3.2+.
 #                           Windows only.
@@ -496,6 +502,9 @@ if(NOT "${CUDA_TOOLKIT_ROOT_DIR}" STREQUAL "${CUDA_TOOLKIT_ROOT_DIR_INTERNAL}")
   unset(CUDA_curand_LIBRARY CACHE)
   unset(CUDA_cusparse_LIBRARY CACHE)
   unset(CUDA_npp_LIBRARY CACHE)
+  unset(CUDA_nppc_LIBRARY CACHE)
+  unset(CUDA_nppi_LIBRARY CACHE)
+  unset(CUDA_npps_LIBRARY CACHE)
   unset(CUDA_nvcuvenc_LIBRARY CACHE)
   unset(CUDA_nvcuvid_LIBRARY CACHE)
 endif()
@@ -700,7 +709,13 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
     find_cuda_helper_libs(nvcuvid)
   endif()
 endif()
-if(NOT CUDA_VERSION VERSION_LESS "4.0")
+if(CUDA_VERSION VERSION_GREATER "5.0")
+  # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
+  find_cuda_helper_libs(nppc)
+  find_cuda_helper_libs(nppi)
+  find_cuda_helper_libs(npps)
+  set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppi_LIBRARY};${CUDA_npps_LIBRARY}")
+elseif(NOT CUDA_VERSION VERSION_LESS "4.0")
   find_cuda_helper_libs(npp)
 endif()
 

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

Summary of changes:
 Modules/FindCUDA.cmake |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake