[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2384-g2eb3d64

James Bigler jamesbigler at gmail.com
Mon Mar 4 15:55:59 EST 2013


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  2eb3d64f396d7efbef01a7d936fca9f22e0bff78 (commit)
       via  44fe92b4f566f68cb44bcd629b45a3d7cedf35ba (commit)
      from  f6ec7d138b748dc82de52ed1ecee9f77ebf43732 (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=2eb3d64f396d7efbef01a7d936fca9f22e0bff78
commit 2eb3d64f396d7efbef01a7d936fca9f22e0bff78
Merge: f6ec7d1 44fe92b
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Mar 4 15:55:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 4 15:55:57 2013 -0500

    Merge topic 'FindCUDA.cmake/DontLinkAgainstCUDADriver' into next
    
    44fe92b Fix: 0013084 - Remove linkage against CUDA driver library.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44fe92b4f566f68cb44bcd629b45a3d7cedf35ba
commit 44fe92b4f566f68cb44bcd629b45a3d7cedf35ba
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Mar 4 13:53:27 2013 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Mar 4 13:53:27 2013 -0700

    Fix: 0013084 - Remove linkage against CUDA driver library.
    
    The CUDA runtime library (libcudart) doesn't depend on the driver API library (libcuda)
    and shouldn't be used to link CUDA run time codes.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 5a834b1..c17a360 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -605,11 +605,6 @@ endif()
 # some platforms.
 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 |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list