[Cmake-commits] CMake branch, next, updated. v3.6.1-1067-g22a76e3

[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  22a76e3b9116497edf0585ede878f7ce28cba690 (commit)
       via  15a6ae5cb7d2d7b67ef5704acd01b6f6765fd5d9 (commit)
      from  51985a880bf3a93b161159cac04e8a2edb268010 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22a76e3b9116497edf0585ede878f7ce28cba690
commit 22a76e3b9116497edf0585ede878f7ce28cba690
Merge: 51985a8 15a6ae5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 15:36:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 15:36:39 2016 -0400

    Merge topic 'FindCUDA-arch' into next
    
    15a6ae5c FindCUDA: Add search path for nvcc on Arch


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15a6ae5cb7d2d7b67ef5704acd01b6f6765fd5d9
commit 15a6ae5cb7d2d7b67ef5704acd01b6f6765fd5d9
Author:     Hans Gaiser <j.c.gaiser at delftrobotics.com>
AuthorDate: Tue Aug 2 11:00:43 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 15:36:07 2016 -0400

    FindCUDA: Add search path for nvcc on Arch

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 6d9b833..dbc56bb 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -621,7 +621,8 @@ if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING)
   # Now search default paths
   find_path(CUDA_TOOLKIT_ROOT_DIR
     NAMES nvcc nvcc.exe
-    PATHS /usr/local/bin
+    PATHS /opt/cuda/bin
+          /usr/local/bin
           /usr/local/cuda/bin
     DOC "Toolkit location."
     )

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

Summary of changes:
 Modules/FindCUDA.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake