Cleanup CMakeLists.txt of ocl module

modules/ocl/CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT HAVE_OPENCL)
 endif()
 
 set(the_description "OpenCL-accelerated Computer Vision")
-ocv_add_module(ocl opencv_core opencv_imgproc opencv_calib3d opencv_objdetect opencv_video opencv_nonfree opencv_ts)
+ocv_add_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video)
 
 ocv_module_include_directories()
 
@@ -39,12 +39,7 @@ if (HAVE_OPENCL)
   endif()
 endif()
 
-ocv_set_module_sources(
-    HEADERS ${lib_hdrs}
-    SOURCES ${lib_int_hdrs} ${lib_srcs}
-    )
-
-set(OPENCV_MODULE_opencv_ocl_SOURCES ${OPENCV_MODULE_opencv_ocl_SOURCES} ${kernels_cpp})
+ocv_set_module_sources(HEADERS ${lib_hdrs} SOURCES ${lib_int_hdrs} ${lib_srcs} ${kernels_cpp})
 ocv_create_module(${ocl_link_libs})
 
 install(FILES ${lib_hdrs}
@@ -61,6 +56,7 @@ file(GLOB test_hdrs "test/*.hpp" "test/*.h")
 
 ocv_add_accuracy_tests(FILES "Include" ${test_hdrs}
                        FILES "Src" ${test_srcs})
+
 ################################################################################################################
 ################################   OpenCL Module Performance  ##################################################
 ################################################################################################################

modules/ocl/src/precomp.hpp

@@ -63,16 +63,14 @@
 #include <exception>
 #include <stdio.h>
 
-#include "opencv2/ocl/ocl.hpp"
-
-#include "opencv2/imgproc/imgproc.hpp"
-
-#include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/core_c.h"
-//#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/ocl/ocl.hpp"
+
 #include "opencv2/core/internal.hpp"
+//#include "opencv2/highgui/highgui.hpp"
 
 #define __ATI__