diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index b5eed9a04..4d3ed842c 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