From 67a2066c4b411897f7a4f12c9ae921cfec45e660 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 24 Feb 2015 18:38:52 +0300 Subject: [PATCH] Java and python wrappers for contrib modules --- modules/bgsegm/CMakeLists.txt | 2 +- modules/bioinspired/CMakeLists.txt | 2 +- modules/ccalib/CMakeLists.txt | 2 +- modules/cvv/CMakeLists.txt | 2 +- modules/datasets/CMakeLists.txt | 2 +- modules/face/CMakeLists.txt | 2 +- modules/latentsvm/CMakeLists.txt | 2 +- modules/line_descriptor/CMakeLists.txt | 4 +--- modules/optflow/CMakeLists.txt | 2 +- modules/reg/CMakeLists.txt | 2 +- modules/rgbd/CMakeLists.txt | 2 +- modules/saliency/CMakeLists.txt | 2 +- modules/surface_matching/CMakeLists.txt | 2 +- modules/text/CMakeLists.txt | 2 +- modules/xfeatures2d/CMakeLists.txt | 2 +- modules/ximgproc/CMakeLists.txt | 2 +- modules/xobjdetect/CMakeLists.txt | 2 +- modules/xphoto/CMakeLists.txt | 2 +- 18 files changed, 18 insertions(+), 20 deletions(-) diff --git a/modules/bgsegm/CMakeLists.txt b/modules/bgsegm/CMakeLists.txt index a497fb2c9..14152ba96 100644 --- a/modules/bgsegm/CMakeLists.txt +++ b/modules/bgsegm/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Background Segmentation Algorithms") -ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_highgui) +ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_highgui WRAP python) diff --git a/modules/bioinspired/CMakeLists.txt b/modules/bioinspired/CMakeLists.txt index c800d33ff..1d6233f33 100644 --- a/modules/bioinspired/CMakeLists.txt +++ b/modules/bioinspired/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Biologically inspired algorithms") ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) -ocv_define_module(bioinspired opencv_core OPTIONAL opencv_highgui opencv_ocl) +ocv_define_module(bioinspired opencv_core OPTIONAL opencv_highgui opencv_ocl WRAP java) diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt index add019d78..5700a1204 100644 --- a/modules/ccalib/CMakeLists.txt +++ b/modules/ccalib/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Custom Calibration Pattern") -ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d) +ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d WRAP python) diff --git a/modules/cvv/CMakeLists.txt b/modules/cvv/CMakeLists.txt index 2bcbb1b7a..6c3224192 100644 --- a/modules/cvv/CMakeLists.txt +++ b/modules/cvv/CMakeLists.txt @@ -17,4 +17,4 @@ foreach(dt5_dep Core Gui Widgets) endforeach() set(the_description "Debug visualization framework") -ocv_define_module(cvv opencv_core opencv_imgproc opencv_features2d ${CVV_LIBRARIES}) +ocv_define_module(cvv opencv_core opencv_imgproc opencv_features2d ${CVV_LIBRARIES} WRAP python) diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt index 0102b7a92..47afccbb8 100644 --- a/modules/datasets/CMakeLists.txt +++ b/modules/datasets/CMakeLists.txt @@ -1,4 +1,4 @@ set(the_description "datasets framework") -ocv_define_module(datasets opencv_core opencv_face opencv_ml opencv_flann opencv_text) +ocv_define_module(datasets opencv_core opencv_face opencv_ml opencv_flann opencv_text WRAP python) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267) # flann, Win64 diff --git a/modules/face/CMakeLists.txt b/modules/face/CMakeLists.txt index fe02ecb11..7dc833a25 100644 --- a/modules/face/CMakeLists.txt +++ b/modules/face/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Face recognition etc") -ocv_define_module(face opencv_core opencv_imgproc) +ocv_define_module(face opencv_core opencv_imgproc WRAP python) diff --git a/modules/latentsvm/CMakeLists.txt b/modules/latentsvm/CMakeLists.txt index 7c1ae441d..8653df9c0 100644 --- a/modules/latentsvm/CMakeLists.txt +++ b/modules/latentsvm/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Object Detection") -ocv_define_module(latentsvm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui) +ocv_define_module(latentsvm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python) diff --git a/modules/line_descriptor/CMakeLists.txt b/modules/line_descriptor/CMakeLists.txt index 91a54ce3e..d0b0b4b46 100644 --- a/modules/line_descriptor/CMakeLists.txt +++ b/modules/line_descriptor/CMakeLists.txt @@ -1,4 +1,2 @@ set(the_description "Line descriptor") -ocv_define_module(line_descriptor opencv_features2d opencv_imgproc opencv_highgui) - - +ocv_define_module(line_descriptor opencv_features2d opencv_imgproc opencv_highgui WRAP python) diff --git a/modules/optflow/CMakeLists.txt b/modules/optflow/CMakeLists.txt index 5916b2b76..9887a3828 100644 --- a/modules/optflow/CMakeLists.txt +++ b/modules/optflow/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Optical Flow Algorithms") -ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_highgui) +ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_highgui WRAP python) diff --git a/modules/reg/CMakeLists.txt b/modules/reg/CMakeLists.txt index 8bb987706..cb928cf88 100644 --- a/modules/reg/CMakeLists.txt +++ b/modules/reg/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Image Registration") -ocv_define_module(reg opencv_imgproc opencv_core) +ocv_define_module(reg opencv_imgproc opencv_core WRAP python) diff --git a/modules/rgbd/CMakeLists.txt b/modules/rgbd/CMakeLists.txt index 9a347c185..f7c6b17e7 100644 --- a/modules/rgbd/CMakeLists.txt +++ b/modules/rgbd/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "RGBD algorithms") ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) -ocv_define_module(rgbd opencv_core opencv_calib3d opencv_highgui opencv_imgproc) +ocv_define_module(rgbd opencv_core opencv_calib3d opencv_highgui opencv_imgproc WRAP python) diff --git a/modules/saliency/CMakeLists.txt b/modules/saliency/CMakeLists.txt index e2eda6568..31f09f986 100644 --- a/modules/saliency/CMakeLists.txt +++ b/modules/saliency/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Saliency API") set(OPENCV_MODULE_IS_PART_OF_WORLD OFF) -ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d) +ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d WRAP python) diff --git a/modules/surface_matching/CMakeLists.txt b/modules/surface_matching/CMakeLists.txt index 9421b355c..8887bbcd7 100644 --- a/modules/surface_matching/CMakeLists.txt +++ b/modules/surface_matching/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "3D point features") -ocv_define_module(surface_matching opencv_core opencv_flann) +ocv_define_module(surface_matching opencv_core opencv_flann WRAP python) diff --git a/modules/text/CMakeLists.txt b/modules/text/CMakeLists.txt index 3324bac65..1e0a8e54d 100644 --- a/modules/text/CMakeLists.txt +++ b/modules/text/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(${Tesseract_INCLUDE_DIR}) endif() set(the_description "Text Detection and Recognition") -ocv_define_module(text opencv_ml opencv_highgui opencv_imgproc opencv_core opencv_features2d) +ocv_define_module(text opencv_ml opencv_highgui opencv_imgproc opencv_core opencv_features2d WRAP python) if(${Tesseract_FOUND}) target_link_libraries(opencv_text ${Tesseract_LIBS}) diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index 2dd2ce87f..2cac3e69b 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection") ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml - OPTIONAL opencv_cudaarithm) + OPTIONAL opencv_cudaarithm WRAP python) diff --git a/modules/ximgproc/CMakeLists.txt b/modules/ximgproc/CMakeLists.txt index 8aa4b6444..5fe74ef09 100644 --- a/modules/ximgproc/CMakeLists.txt +++ b/modules/ximgproc/CMakeLists.txt @@ -1,5 +1,5 @@ set(the_description "Extended image processing module. It includes edge-aware filters and etc.") set(OPENCV_MODULE_IS_PART_OF_WORLD OFF) -ocv_define_module(ximgproc opencv_imgproc opencv_core opencv_highgui) +ocv_define_module(ximgproc opencv_imgproc opencv_core opencv_highgui WRAP python) target_link_libraries(opencv_ximgproc) diff --git a/modules/xobjdetect/CMakeLists.txt b/modules/xobjdetect/CMakeLists.txt index 82488a70e..8d78c8a9f 100644 --- a/modules/xobjdetect/CMakeLists.txt +++ b/modules/xobjdetect/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Object detection algorithms") -ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_highgui) +ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_highgui WRAP python) diff --git a/modules/xphoto/CMakeLists.txt b/modules/xphoto/CMakeLists.txt index 31d04beb2..44a1e8a0c 100644 --- a/modules/xphoto/CMakeLists.txt +++ b/modules/xphoto/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Addon to basic photo module") -ocv_define_module(xphoto opencv_core opencv_imgproc OPTIONAL opencv_photo opencv_highgui opencv_photo) \ No newline at end of file +ocv_define_module(xphoto opencv_core opencv_imgproc OPTIONAL opencv_photo opencv_highgui opencv_photo WRAP python)