generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup CMakeLists.txt of ocl module

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-20 16:37:46 +04:00
parent ecb707ca7b
commit 63397e825c
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/ocl/CMakeLists.txt
View File

@ -4,7 +4,7 @@ if(NOT HAVE_OPENCL)
endif() endif()
set(the_description "OpenCL-accelerated Computer Vision") 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() ocv_module_include_directories()
@ -27,7 +27,7 @@ source_group("Src\\Host" FILES ${lib_srcs} ${lib_int_hdrs} ${kernels_cpp})
if (HAVE_OPENCL) if (HAVE_OPENCL)
set(ocl_link_libs ${OPENCL_LIBRARIES}) set(ocl_link_libs ${OPENCL_LIBRARIES})
if(OPENCL_INCLUDE_DIR) if(OPENCL_INCLUDE_DIR)
ocv_include_directories(${OPENCL_INCLUDE_DIR}) ocv_include_directories(${OPENCL_INCLUDE_DIR})
endif() endif()
if (HAVE_CLAMDFFT) if (HAVE_CLAMDFFT)
set(ocl_link_libs ${ocl_link_libs} ${CLAMDFFT_LIBRARIES}) set(ocl_link_libs ${ocl_link_libs} ${CLAMDFFT_LIBRARIES})
@ -39,17 +39,12 @@ if (HAVE_OPENCL)
endif() endif()
endif() endif()
ocv_set_module_sources( ocv_set_module_sources(HEADERS ${lib_hdrs} SOURCES ${lib_int_hdrs} ${lib_srcs} ${kernels_cpp})
HEADERS ${lib_hdrs}
SOURCES ${lib_int_hdrs} ${lib_srcs}
)
set(OPENCV_MODULE_opencv_ocl_SOURCES ${OPENCV_MODULE_opencv_ocl_SOURCES} ${kernels_cpp})
ocv_create_module(${ocl_link_libs}) ocv_create_module(${ocl_link_libs})
install(FILES ${lib_hdrs} install(FILES ${lib_hdrs}
DESTINATION include/opencv2/${name} DESTINATION include/opencv2/${name}
COMPONENT main) COMPONENT main)
ocv_add_precompiled_headers(${the_module}) ocv_add_precompiled_headers(${the_module})
@ -61,6 +56,7 @@ file(GLOB test_hdrs "test/*.hpp" "test/*.h")
ocv_add_accuracy_tests(FILES "Include" ${test_hdrs} ocv_add_accuracy_tests(FILES "Include" ${test_hdrs}
FILES "Src" ${test_srcs}) FILES "Src" ${test_srcs})
################################################################################################################ ################################################################################################################
################################ OpenCL Module Performance ################################################## ################################ OpenCL Module Performance ##################################################
################################################################################################################ ################################################################################################################
@ -68,4 +64,4 @@ file(GLOB perf_srcs "perf/*.cpp")
file(GLOB perf_hdrs "perf/*.hpp" "perf/*.h") file(GLOB perf_hdrs "perf/*.hpp" "perf/*.h")
ocv_add_perf_tests(FILES "Include" ${perf_hdrs} ocv_add_perf_tests(FILES "Include" ${perf_hdrs}
FILES "Src" ${perf_srcs}) FILES "Src" ${perf_srcs})

10
modules/ocl/src/precomp.hpp
View File

@ -63,16 +63,14 @@
#include <exception> #include <exception>
#include <stdio.h> #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.hpp"
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/core_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/core/internal.hpp"
//#include "opencv2/highgui/highgui.hpp"
#define __ATI__ #define __ATI__