diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7831430e6..0e5cd9ec0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,10 +415,10 @@ if(WITH_OPENCL)
   if(OPENCL_FOUND)
     set(HAVE_OPENCL 1)
   endif()
-  if(WITH_OPENCLAMDFFT)
+  if(WITH_OPENCLAMDFFT AND CLAMDFFT_INCLUDE_DIR)
     set(HAVE_CLAMDFFT 1)
   endif()
-  if(WITH_OPENCLAMDBLAS)
+  if(WITH_OPENCLAMDBLAS AND CLAMDBLAS_INCLUDE_DIR)
     set(HAVE_CLAMDBLAS 1)
   endif()
 endif()
diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake
index f8c15920a..cbbc3e8c1 100644
--- a/cmake/OpenCVDetectOpenCL.cmake
+++ b/cmake/OpenCVDetectOpenCL.cmake
@@ -78,9 +78,17 @@ else()
   # Try AMD/ATI Stream SDK
   if (NOT OPENCL_FOUND)
     set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT})
+    set(ENV_AMDAPPSDKROOT $ENV{AMDAPPSDKROOT})
     set(ENV_OPENCLROOT $ENV{OPENCLROOT})
     set(ENV_CUDA_PATH $ENV{CUDA_PATH})
     if(ENV_AMDSTREAMSDKROOT)
+      set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDAPPSDKROOT}/include)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86)
+      else()
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86_64)
+      endif()
+    elseif(ENV_AMDSTREAMSDKROOT)
       set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include)
       if(CMAKE_SIZEOF_VOID_P EQUAL 4)
         set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86)