Merge pull request opencv#10481 from alalek:fix_10474

alalek · alalek · commit bf80c941252e · 2018-01-02T03:17:59.000Z
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
@@ -667,6 +667,21 @@ macro(ocv_list_filterout lst regex)
   endforeach()
 endmacro()
 
+# filter matching elements from the list
+macro(ocv_list_filter lst regex)
+  set(dst ${ARGN})
+  if(NOT dst)
+    set(dst ${lst})
+  endif()
+  set(__result ${${lst}})
+  foreach(item ${__result})
+    if(NOT item MATCHES "${regex}")
+      list(REMOVE_ITEM __result "${item}")
+    endif()
+  endforeach()
+  set(${dst} ${__result})
+endmacro()
+
 
 # stable & safe duplicates removal macro
 macro(ocv_list_unique __lst)
diff --git a/modules/python/bindings/CMakeLists.txt b/modules/python/bindings/CMakeLists.txt
@@ -20,7 +20,8 @@ endforeach()
 set(opencv_hdrs "")
 set(opencv_userdef_hdrs "")
 foreach(m ${OPENCV_PYTHON_MODULES})
-  list(APPEND opencv_hdrs ${OPENCV_MODULE_${m}_HEADERS})
+  ocv_list_filter(OPENCV_MODULE_${m}_HEADERS "${OPENCV_MODULE_${m}_LOCATION}/include" __hdrs)
+  list(APPEND opencv_hdrs ${__hdrs})
   file(GLOB userdef_hdrs ${OPENCV_MODULE_${m}_LOCATION}/misc/python/pyopencv*.hpp)
   list(APPEND opencv_userdef_hdrs ${userdef_hdrs})
 endforeach(m)
