[Cmake-commits] CMake branch, next, updated. v3.0.2-2109-g6dcdb10

[Clinton Stimpson]

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  6dcdb100fb2a6e7be359c818b03c6bd14dc52893 (commit)
       via  5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d (commit)
      from  14f74453d3650c52e69f56c2d088083020719422 (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=6dcdb100fb2a6e7be359c818b03c6bd14dc52893
commit 6dcdb100fb2a6e7be359c818b03c6bd14dc52893
Merge: 14f7445 5ecf990
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Oct 21 13:53:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 21 13:53:57 2014 -0400

    Merge topic 'cuda-rpath-osx' into next
    
    5ecf990a CUDA:  Remove rpath logic outdated by CMake's own @rpath support.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d
commit 5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Oct 21 11:40:13 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Oct 21 11:50:51 2014 -0600

    CUDA:  Remove rpath logic outdated by CMake's own @rpath support.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 2e2b21c..3dd975c 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -703,18 +703,6 @@ if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
 else()
   set(CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY})
 endif()
-if(APPLE)
-  # We need to add the path to cudart to the linker using rpath, since the
-  # library name for the cuda libraries is prepended with @rpath.
-  if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
-    get_filename_component(_cuda_path_to_cudart "${CUDA_CUDARTEMU_LIBRARY}" PATH)
-  else()
-    get_filename_component(_cuda_path_to_cudart "${CUDA_CUDART_LIBRARY}" PATH)
-  endif()
-  if(_cuda_path_to_cudart)
-    list(APPEND CUDA_LIBRARIES -Wl,-rpath "-Wl,${_cuda_path_to_cudart}")
-  endif()
-endif()
 
 # 1.1 toolkit on linux doesn't appear to have a separate library on
 # some platforms.

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

Summary of changes:
 Modules/FindCUDA.cmake |   12 ------------
 1 file changed, 12 deletions(-)


hooks/post-receive
-- 
CMake