Merge pull request #1471 from ozantonkal:master

2013-09-25 17:19:37 +04:00
parent e1f55c3fcc 5780b418c9
commit c6ab8cb6ee
50 changed files with 15144 additions and 0 deletions
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -83,6 +83,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
    ocv_list_filterout(cpp_samples "/gpu/")
  endif()

+  ocv_list_filterout(cpp_samples "viz")
+
  foreach(sample_filename ${cpp_samples})
    get_filename_component(sample ${sample_filename} NAME_WE)
    OPENCV_DEFINE_CPP_EXAMPLE(${sample}  ${sample_filename})