[Cmake-commits] CMake branch, master, updated. v2.8.10.2-829-g2a3011b

[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, master has been updated
       via  2a3011b536fc65bda50fea16f5c5a3444e6bccc3 (commit)
       via  c939b4948c29116611e3b356af4c7e9b6fbb94ab (commit)
      from  142357ac76adec4c1318c603db44725aeb2f7a24 (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=2a3011b536fc65bda50fea16f5c5a3444e6bccc3
commit 2a3011b536fc65bda50fea16f5c5a3444e6bccc3
Merge: 142357a c939b49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 13:46:21 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 12 13:46:21 2013 -0400

    Merge topic 'FindCUDA.cmake/AddCUDA_cupti_LIBRARY'
    
    c939b49 FindCUDA: Added cupti library.

diff --cc Modules/FindCUDA.cmake
index 76cfd81,b98df62..61d6ea7
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@@ -638,8 -622,13 +657,8 @@@ endif(
  
  # 1.1 toolkit on linux doesn't appear to have a separate library on
  # some platforms.
- find_library_local_first(CUDA_CUDA_LIBRARY cuda "\"cuda\" library (older versions only).")
+ cuda_find_library_local_first(CUDA_CUDA_LIBRARY cuda "\"cuda\" library (older versions only).")
  
 -# Add cuda library to the link line only if it is found.
 -if (CUDA_CUDA_LIBRARY)
 -  set(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
 -endif()
 -
  mark_as_advanced(
    CUDA_CUDA_LIBRARY
    CUDA_CUDART_LIBRARY

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

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


hooks/post-receive
-- 
CMake