[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3271-g632b3a8

[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  632b3a823c97dd58d1d71c94ede866cd16a72015 (commit)
       via  07646de0e37e1c51d5b8b6f2e101841ffcec2b68 (commit)
      from  5c611402de0f8af1893e36d635b241ed61015949 (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=632b3a823c97dd58d1d71c94ede866cd16a72015
commit 632b3a823c97dd58d1d71c94ede866cd16a72015
Merge: 5c61140 07646de
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jul 22 09:16:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 09:16:31 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07646de0e37e1c51d5b8b6f2e101841ffcec2b68
commit 07646de0e37e1c51d5b8b6f2e101841ffcec2b68
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jul 22 09:12:29 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jul 22 09:12:29 2013 -0400

    FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
    
    Correction from James Bigler to add the <prefix>/lib/<arch>/nvidida-current to
    the system find_library call which is used after the user libraries
    have been searched.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 958ed15..0390ae4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -602,13 +602,16 @@ 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
     )
   # 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:
 Modules/FindCUDA.cmake |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake