fixed few compile errors and doc build errors

2013-11-18 13:48:04 -05:00
parent 8762ee3f6f
commit e2bbe7597b
11 changed files with 52 additions and 56 deletions
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -499,7 +499,7 @@ macro(ocv_glob_module_sources)
  source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})

  file(GLOB cl_kernels "src/opencl/*.cl")
-  if(HAVE_opencv_ocl AND cl_kernels)
+  if(cl_kernels)
    ocv_include_directories(${OPENCL_INCLUDE_DIRS})
    string(REGEX REPLACE "opencv_" "" the_module_barename "${the_module}")
    add_custom_command(