[Cmake-commits] CMake branch, master, updated. v3.10.0-rc2-70-gb361990

[Kitware Robot]

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, master has been updated
       via  b361990007a4d40f5a0f682455bcea89efd7eecc (commit)
       via  060fd23313271df7c1c8f1c14a662edeff118a0e (commit)
      from  01c836c951f99b0a26c8b5ac4e3c0587a920e26b (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=b361990007a4d40f5a0f682455bcea89efd7eecc
commit b361990007a4d40f5a0f682455bcea89efd7eecc
Merge: 01c836c 060fd23
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 17 12:32:44 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 17 08:32:53 2017 -0400

    Merge topic 'Linux-CUDA-OpenCL'
    
    060fd233 FindOpenCL: Add support for CUDA OpenCL on Linux
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1387


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=060fd23313271df7c1c8f1c14a662edeff118a0e
commit 060fd23313271df7c1c8f1c14a662edeff118a0e
Author:     Takenori Yamamoto <yamamoto.takenory at gmail.com>
AuthorDate: Sun Oct 15 15:18:17 2017 +0900
Commit:     Takenori Yamamoto <yamamoto.takenory at gmail.com>
CommitDate: Sun Oct 15 15:18:17 2017 +0900

    FindOpenCL: Add support for CUDA OpenCL on Linux
    
    When setting CUDA_PATH, the include directory ($CUDA_PATH/include) was found, but libOpenCL.so was not found. This patch resloved the issue.

diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index b8a7d82..ba87086 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -120,9 +120,12 @@ else()
     NAMES OpenCL
     PATHS
       ENV AMDAPPSDKROOT
+      ENV CUDA_PATH
     PATH_SUFFIXES
       lib/x86_64
-      lib/x64)
+      lib/x64
+      lib
+      lib64)
 endif()
 
 set(OpenCL_LIBRARIES ${OpenCL_LIBRARY})

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

Summary of changes:
 Modules/FindOpenCL.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake