generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4109 from alalek:fix_build_dbt_bindings

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-06-16 13:06:36 +00:00
commit a003d1d758
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
View File

@ -44,6 +44,7 @@
#ifndef __OPENCV_OBJDETECT_DBT_HPP__ #ifndef __OPENCV_OBJDETECT_DBT_HPP__
#define __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__) || \ #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
(defined(__cplusplus) && __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700) (defined(__cplusplus) && __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)

1
modules/python/common.cmake
View File

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