[Cmake-commits] CMake branch, next, updated. v3.0.0-3856-g9f9c716

[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  9f9c7166bce00eeb2b22b13c5f8d58f3ab152746 (commit)
       via  d4295539767d8850e3d75a64a863d438f275e185 (commit)
      from  720ac23ba60789335d294e051e2a2c48eef4e2b8 (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=9f9c7166bce00eeb2b22b13c5f8d58f3ab152746
commit 9f9c7166bce00eeb2b22b13c5f8d58f3ab152746
Merge: 720ac23 d429553
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 23 10:27:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 23 10:27:44 2014 -0400

    Merge topic 'FindOpenCL-fix-ENV' into next
    
    d4295539 FindOpenCL: Added missing ENV for each environment variable reference


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4295539767d8850e3d75a64a863d438f275e185
commit d4295539767d8850e3d75a64a863d438f275e185
Author:     Matthäus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Jun 22 10:41:11 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 23 10:26:52 2014 -0400

    FindOpenCL: Added missing ENV for each environment variable reference
    
    Also add an 'include' path suffix that may appear after the value of
    some of the environment variables.

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:


hooks/post-receive
-- 
CMake