Merge branch '2.4'

2013-03-29 18:48:06 +04:00
parent 3ceca9b7b1 e143706ef9
commit f77a375354
291 changed files with 5110 additions and 2325 deletions
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -654,9 +654,6 @@ function(ocv_add_perf_tests)

      ocv_add_precompiled_headers(${the_target})

-      if (PYTHON_EXECUTABLE)
-        add_dependencies(perf ${the_target})
-      endif()
    else(OCV_DEPENDENCIES_FOUND)
      # TODO: warn about unsatisfied dependencies
    endif(OCV_DEPENDENCIES_FOUND)