Merge pull request #1418 from mshabunin:remove-cmake-submodules

modules/README.md

@@ -18,8 +18,6 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_<r
 
 - **cnn_3dobj**: Deep Object Recognition and Pose -- Uses Caffe Deep Neural Net library to build, train and test a CNN model of visual object recognition and pose.
 
-- **contrib_world**: opencv_contrib holder -- contrib_world is the module that when built, contains all other opencv_contrib modules. It may be used for the more convenient redistribution of opencv binaries.
-
 - **cvv**: Computer Vision Debugger -- Simple code that you can add to your program that pops up a GUI allowing you to interactively and visually debug computer vision programs.
 
 - **datasets**: Datasets Reader -- Code for reading existing computer vision databases and samples of using the readers to train, test and run using that dataset's data.

modules/contrib_world/CMakeLists.txt

@@ -1,50 +0,0 @@
-set(the_description "Separate world module containing all contrib modules")
-
-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
-set(BUILD_opencv_contrib_world_INIT OFF) # disabled by default
-
-# add new submodules to this list
-set(OPENCV_MODULE_CHILDREN
-  aruco
-  bgsegm
-  bioinspired
-  ccalib
-  cvv
-  datasets
-  dpm
-  face
-  fuzzy
-  hdf
-  line_descriptor
-  optflow
-  plot
-  reg
-  rgbd
-  saliency
-  sfm
-  stereo
-  structured_light
-  surface_matching
-  text
-  tracking
-  xfeatures2d
-  ximgproc
-  xobjdetect
-  xphoto
-)
-ocv_list_add_prefix(OPENCV_MODULE_CHILDREN "opencv_")
-
-ocv_define_module(contrib_world)
-
-# ocv_add_module(contrib_world)
-
-# set(link_deps "")
-# foreach(m ${OPENCV_MODULE_opencv_contrib_world_CHILDREN})
-#   list(APPEND link_deps ${OPENCV_MODULE_${m}_LINK_DEPS})
-# endforeach()
-
-#
-# ocv_glob_module_sources()
-# ocv_module_include_directories()
-#
-# ocv_create_module(${link_deps})

modules/contrib_world/README.md

@@ -1,5 +0,0 @@
-contrib_world -- opencv_contrib container
-=========================================
-
-contrib_world is the module that when built, contains all other opencv_contrib modules.
-It may be used for the more convenient redistribution of opencv binaries.

modules/contrib_world/include/opencv2/contrib_world.hpp

@@ -1,5 +0,0 @@
-#ifndef __OPENCV_CONTRIB_WORLD_HPP__
-#define __OPENCV_CONTRIB_WORLD_HPP__
-
-
-#endif

modules/contrib_world/src/dummy.cpp

@@ -1 +0,0 @@
-#include "opencv2/contrib_world.hpp"