Merge pull request #4109 from alalek:fix_build_dbt_bindings

a003d1d7 · Vadim Pisarevsky · f824db48 · caaf60ba · a003d1d7 · a003d1d7
Showing with 2 addition and 0 deletion

modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp ...ect/include/opencv2/objdetect/detection_based_tracker.hpp +1 -0

modules/python/common.cmake modules/python/common.cmake +1 -0

未找到文件。
--- a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
@@ -44,6 +44,7 @@
 #ifndef __OPENCV_OBJDETECT_DBT_HPP__
 #define __OPENCV_OBJDETECT_DBT_HPP__
+// After this condition removal update blacklist for bindings: modules/python/common.cmake
 #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
  (defined(__cplusplus) &&  __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)

--- a/modules/python/common.cmake
+++ b/modules/python/common.cmake
@@ -28,6 +28,7 @@ endforeach(m)
 ocv_list_filterout(opencv_hdrs ".h$")
 ocv_list_filterout(opencv_hdrs "cuda")
 ocv_list_filterout(opencv_hdrs "cudev")
+ocv_list_filterout(opencv_hdrs "detection_based_tracker.hpp") # Conditional compilation
 set(cv2_generated_hdrs
    "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"