|
|
@ -200,19 +200,6 @@ macro(ocv_add_module _name) |
|
|
|
set(OPENCV_MODULES_DISABLED_USER ${OPENCV_MODULES_DISABLED_USER} "${the_module}" CACHE INTERNAL "List of OpenCV modules explicitly disabled by user") |
|
|
|
set(OPENCV_MODULES_DISABLED_USER ${OPENCV_MODULES_DISABLED_USER} "${the_module}" CACHE INTERNAL "List of OpenCV modules explicitly disabled by user") |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
# add reverse wrapper dependencies (BINDINDS) |
|
|
|
|
|
|
|
foreach (wrapper ${OPENCV_MODULE_${the_module}_WRAPPERS}) |
|
|
|
|
|
|
|
if(wrapper STREQUAL "python") # hack for python (BINDINDS) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_python2 OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_python3 OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
else() |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_${wrapper} OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
if(DEFINED OPENCV_MODULE_opencv_${wrapper}_bindings_generator_CLASS) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_${wrapper}_bindings_generator OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
endforeach() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# stop processing of current file |
|
|
|
# stop processing of current file |
|
|
|
ocv_cmake_hook(POST_ADD_MODULE) |
|
|
|
ocv_cmake_hook(POST_ADD_MODULE) |
|
|
|
ocv_cmake_hook(POST_ADD_MODULE_${the_module}) |
|
|
|
ocv_cmake_hook(POST_ADD_MODULE_${the_module}) |
|
|
@ -499,6 +486,21 @@ function(__ocv_resolve_dependencies) |
|
|
|
endforeach() |
|
|
|
endforeach() |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# add reverse wrapper dependencies (BINDINDS) |
|
|
|
|
|
|
|
foreach(the_module ${OPENCV_MODULES_BUILD}) |
|
|
|
|
|
|
|
foreach (wrapper ${OPENCV_MODULE_${the_module}_WRAPPERS}) |
|
|
|
|
|
|
|
if(wrapper STREQUAL "python") # hack for python (BINDINDS) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_python2 OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_python3 OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
else() |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_${wrapper} OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
if(DEFINED OPENCV_MODULE_opencv_${wrapper}_bindings_generator_CLASS) |
|
|
|
|
|
|
|
ocv_add_dependencies(opencv_${wrapper}_bindings_generator OPTIONAL ${the_module}) |
|
|
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
endforeach() |
|
|
|
|
|
|
|
endforeach() |
|
|
|
|
|
|
|
|
|
|
|
# disable MODULES with unresolved dependencies |
|
|
|
# disable MODULES with unresolved dependencies |
|
|
|
set(has_changes ON) |
|
|
|
set(has_changes ON) |
|
|
|
while(has_changes) |
|
|
|
while(has_changes) |
|
|
|