Commit bf80c941 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #10481 from alalek:fix_10474

parents 22576f4d ea5a3e55
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment