cmake: workaround for dependencies resolver (bypass non-module deps w/o check)

pull/1551/head
Alexander Alekhin 11 years ago
parent 7a53910495
commit 034a77c26d
  1. 15
      cmake/OpenCVModule.cmake

@ -312,11 +312,16 @@ function(__ocv_resolve_dependencies)
set(__deps ${OPENCV_MODULE_${m}_REQ_DEPS} ${OPENCV_MODULE_${m}_PRIVATE_REQ_DEPS})
while(__deps)
ocv_list_pop_front(__deps d)
if(NOT (HAVE_${d} OR TARGET ${d} OR EXISTS ${d}))
# message(STATUS "Module ${m} disabled because ${d} dependency can't be resolved!")
__ocv_module_turn_off(${m})
set(has_changes ON)
break()
string(TOLOWER "${d}" upper_d)
if(NOT (HAVE_${d} OR HAVE_${upper_d} OR TARGET ${d} OR EXISTS ${d}))
if(d MATCHES "^opencv_") # TODO Remove this condition in the future and use HAVE_ variables only
message(STATUS "Module ${m} disabled because ${d} dependency can't be resolved!")
__ocv_module_turn_off(${m})
set(has_changes ON)
break()
else()
message(STATUS "Assume that non-module dependency is available: ${d} (for module ${m})")
endif()
endif()
endwhile()
endforeach()

Loading…
Cancel
Save