[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3218-g2920df8

[Robert Maynard]

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  2920df8ef85edf4c46796dde732dabc4ad3e1185 (commit)
       via  0cfe4cd0dd5fbca7ee3562d9c53bc7a3fca1f564 (commit)
      from  654266d9b74eea1ea969f9385f017b1f8d7ba523 (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=2920df8ef85edf4c46796dde732dabc4ad3e1185
commit 2920df8ef85edf4c46796dde732dabc4ad3e1185
Merge: 654266d 0cfe4cd
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jul 18 11:49:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 18 11:49:30 2013 -0400

    Merge topic 'FindCuda_more_search_paths' into next
    
    0cfe4cd FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cfe4cd0dd5fbca7ee3562d9c53bc7a3fca1f564
commit 0cfe4cd0dd5fbca7ee3562d9c53bc7a3fca1f564
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri May 24 10:03:57 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri May 24 10:50:52 2013 -0400

    FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
    
    Ubuntu install the CUDA libraries into a location that is different
    than the default location provided by the NVidia installer. So we
    teach the FindCUDA package to also find the Ubuntu install location.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 5a680e3..958ed15 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -602,6 +602,7 @@ macro(cuda_find_library_local_first_with_path_ext _var _names _doc _path_ext )
     PATHS "${CUDA_TOOLKIT_ROOT_DIR}"
     ENV CUDA_PATH
     ENV CUDA_LIB_PATH
+    "/usr/lib/nvidia-current"
     PATH_SUFFIXES ${_cuda_64bit_lib_dir} "${_path_ext}lib/Win32" "${_path_ext}lib" "${_path_ext}libWin32"
     DOC ${_doc}
     NO_DEFAULT_PATH

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

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


hooks/post-receive
-- 
CMake