[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3273-gf0256bc

[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  f0256bcb76ea0038e6fa638ac793a2a45dbd032c (commit)
       via  09f00a63713c06ffa1830eafb200bc3aa5220e64 (commit)
      from  632b3a823c97dd58d1d71c94ede866cd16a72015 (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=f0256bcb76ea0038e6fa638ac793a2a45dbd032c
commit f0256bcb76ea0038e6fa638ac793a2a45dbd032c
Merge: 632b3a8 09f00a6
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jul 22 09:25:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 09:25:25 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09f00a63713c06ffa1830eafb200bc3aa5220e64
commit 09f00a63713c06ffa1830eafb200bc3aa5220e64
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: Mon Jul 22 09:16:11 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..0390ae4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -607,7 +607,11 @@ macro(cuda_find_library_local_first_with_path_ext _var _names _doc _path_ext )
     NO_DEFAULT_PATH
     )
   # Search default search paths, after we search our own set of paths.
-  find_library(${_var} NAMES ${_names} DOC ${_doc})
+  find_library(${_var}
+    NAMES ${_names}
+    PATHS "/usr/lib/nvidia-current"
+    DOC ${_doc}
+    )
 endmacro()
 
 macro(cuda_find_library_local_first _var _names _doc)

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

Summary of changes:


hooks/post-receive
-- 
CMake