[Cmake-commits] CMake branch, next, updated. v3.0.2-2131-g71a8397

[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  71a8397f8cc55d23ef221e861664a4c9f4254e0b (commit)
       via  59814cb43004ac299b4f0778825b8a3e23515602 (commit)
      from  85d699437bd63249cdd7e7c87b3cf70b5fc677bc (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=71a8397f8cc55d23ef221e861664a4c9f4254e0b
commit 71a8397f8cc55d23ef221e861664a4c9f4254e0b
Merge: 85d6994 59814cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 22 10:51:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 22 10:51:09 2014 -0400

    Merge topic 'cuda-rpath-osx' into next
    
    59814cb4 FindCUDA: Remove rpath logic outdated by CMake's own @rpath support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59814cb43004ac299b4f0778825b8a3e23515602
commit 59814cb43004ac299b4f0778825b8a3e23515602
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Oct 21 11:40:13 2014 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 22 10:50:15 2014 -0400

    FindCUDA: Remove rpath logic outdated by CMake's own @rpath support
    
    Otherwise binaries end up with two copies of the same value and the OS X
    install_name_tool may corrupt them.

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:


hooks/post-receive
-- 
CMake