mirror of
https://github.com/opencv/opencv.git
synced 2025-06-08 01:53:19 +08:00
Merge pull request #19825 from alalek:cmake_fix_headers_order_python_3.4
This commit is contained in:
commit
7f664850f5
@ -26,9 +26,18 @@ foreach(m ${OPENCV_PYTHON_MODULES})
|
|||||||
list(APPEND opencv_hdrs "${hdr}")
|
list(APPEND opencv_hdrs "${hdr}")
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# both wrapping and C++ implementation
|
||||||
|
file(GLOB hdr2 ${OPENCV_MODULE_${m}_LOCATION}/misc/python/python_*.hpp)
|
||||||
|
list(SORT hdr2)
|
||||||
|
list(APPEND opencv_hdrs ${hdr2})
|
||||||
|
list(APPEND opencv_userdef_hdrs ${hdr2})
|
||||||
|
|
||||||
file(GLOB hdr ${OPENCV_MODULE_${m}_LOCATION}/misc/python/shadow*.hpp)
|
file(GLOB hdr ${OPENCV_MODULE_${m}_LOCATION}/misc/python/shadow*.hpp)
|
||||||
|
list(SORT hdr)
|
||||||
list(APPEND opencv_hdrs ${hdr})
|
list(APPEND opencv_hdrs ${hdr})
|
||||||
file(GLOB userdef_hdrs ${OPENCV_MODULE_${m}_LOCATION}/misc/python/pyopencv*.hpp)
|
file(GLOB userdef_hdrs ${OPENCV_MODULE_${m}_LOCATION}/misc/python/pyopencv*.hpp)
|
||||||
|
list(SORT userdef_hdrs)
|
||||||
list(APPEND opencv_userdef_hdrs ${userdef_hdrs})
|
list(APPEND opencv_userdef_hdrs ${userdef_hdrs})
|
||||||
endforeach(m)
|
endforeach(m)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user