[Cmake-commits] CMake branch, next, updated. v3.0.0-3820-gb41f6e8

[Matthaus G. Chajdas]

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  b41f6e86307035dae1b1154a22443eaff378d2db (commit)
       via  9f16a6ed59f6275be7e55737f70b0717f0259d50 (commit)
       via  7c4d890da3f85fafe6350a9de57d9f42ea3a2a90 (commit)
       via  17d98786adb073e6a804d28208d0aeaac6ef82bb (commit)
       via  aaf70719322db96b7a5544964f4104789047f252 (commit)
       via  e68a009367578e3da9aab1f0ed0780edaec48940 (commit)
       via  6af77a2f073db6fc0ad81d8c73ddc12229f8583b (commit)
       via  85025ae7c3d94ea6c10dccb1660d2ee16fb05bfc (commit)
      from  2d4741392b6a3566602ec1d2984d077882bfb876 (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=b41f6e86307035dae1b1154a22443eaff378d2db
commit b41f6e86307035dae1b1154a22443eaff378d2db
Merge: 2d47413 9f16a6e
Author:     Matthaus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Jun 22 04:43:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 22 04:43:52 2014 -0400

    Merge topic 'fix-find-opencl-env' into next
    
    9f16a6ed Fix FindOpenCL.
    7c4d890d CMake Nightly Date Stamp
    17d98786 CMake Nightly Date Stamp
    aaf70719 CMake Nightly Date Stamp
    e68a0093 CMake Nightly Date Stamp
    6af77a2f CMake Nightly Date Stamp
    85025ae7 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f16a6ed59f6275be7e55737f70b0717f0259d50
commit 9f16a6ed59f6275be7e55737f70b0717f0259d50
Author:     Matthäus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Jun 22 10:41:11 2014 +0200
Commit:     Matthäus G. Chajdas <cmake at anteru.net>
CommitDate: Sun Jun 22 10:41:11 2014 +0200

    Fix FindOpenCL.
    
    Added missing ENV for repeated environment variables and additional
    'include' path.

diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index b5eed9a..4d3ed84 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -70,14 +70,15 @@ endfunction()
 find_path(OpenCL_INCLUDE_DIR
   NAMES
     CL/cl.h OpenCL/cl.h
-  PATHS ENV
-    "PROGRAMFILES(X86)"
-    AMDAPPSDKROOT
-    INTELOCLSDKROOT
-    NVSDKCOMPUTE_ROOT
-    CUDA_PATH
-    ATISTREAMSDKROOT
+  PATHS
+    ENV "PROGRAMFILES(X86)"
+    ENV AMDAPPSDKROOT
+    ENV INTELOCLSDKROOT
+    ENV NVSDKCOMPUTE_ROOT
+    ENV CUDA_PATH
+    ENV ATISTREAMSDKROOT
   PATH_SUFFIXES
+    include
     OpenCL/common/inc
     "AMD APP/include")
 
@@ -87,13 +88,13 @@ if(WIN32)
   if(CMAKE_SIZEOF_VOID_P EQUAL 4)
     find_library(OpenCL_LIBRARY
       NAMES OpenCL
-      PATHS ENV
-        "PROGRAMFILES(X86)"
-        AMDAPPSDKROOT
-        INTELOCLSDKROOT
-        CUDA_PATH
-        NVSDKCOMPUTE_ROOT
-        ATISTREAMSDKROOT
+      PATHS
+        ENV "PROGRAMFILES(X86)"
+        ENV AMDAPPSDKROOT
+        ENV INTELOCLSDKROOT
+        ENV CUDA_PATH
+        ENV NVSDKCOMPUTE_ROOT
+        ENV ATISTREAMSDKROOT
       PATH_SUFFIXES
         "AMD APP/lib/x86"
         lib/x86
@@ -102,13 +103,13 @@ if(WIN32)
   elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
     find_library(OpenCL_LIBRARY
       NAMES OpenCL
-      PATHS ENV
-        "PROGRAMFILES(X86)"
-        AMDAPPSDKROOT
-        INTELOCLSDKROOT
-        CUDA_PATH
-        NVSDKCOMPUTE_ROOT
-        ATISTREAMSDKROOT
+      PATHS
+        ENV "PROGRAMFILES(X86)"
+        ENV AMDAPPSDKROOT
+        ENV INTELOCLSDKROOT
+        ENV CUDA_PATH
+        ENV NVSDKCOMPUTE_ROOT
+        ENV ATISTREAMSDKROOT
       PATH_SUFFIXES
         "AMD APP/lib/x86_64"
         lib/x86_64

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

Summary of changes:
 Modules/FindOpenCL.cmake  |   43 ++++++++++++++++++++++---------------------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
CMake