Merge pull request #8860 from alalek:fix_java_headers
This commit is contained in:
commit
fc84c48bd7
@ -149,7 +149,14 @@ foreach(module ${OPENCV_JAVA_MODULES})
|
|||||||
file(STRINGS "${custom_header_list}" module_headers)
|
file(STRINGS "${custom_header_list}" module_headers)
|
||||||
ocv_list_add_prefix(module_headers "${OPENCV_MODULE_opencv_${module}_LOCATION}/")
|
ocv_list_add_prefix(module_headers "${OPENCV_MODULE_opencv_${module}_LOCATION}/")
|
||||||
else()
|
else()
|
||||||
set(module_headers "${OPENCV_MODULE_opencv_${module}_HEADERS}")
|
set(module_headers "")
|
||||||
|
# TODO Implement module's "_HEADERS_PUBLIC" variable (OpenCVModule.cmake)
|
||||||
|
foreach(hdr ${OPENCV_MODULE_opencv_${module}_HEADERS})
|
||||||
|
string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}")
|
||||||
|
if(NOT hdr2 MATCHES "opencv2/${m}/private.*" AND hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$" )
|
||||||
|
list(APPEND module_headers "${hdr}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT module_headers)
|
if(NOT module_headers)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user