|
|
@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) |
|
|
|
else() |
|
|
|
else() |
|
|
|
set(deps "") |
|
|
|
set(deps "") |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
list(INSERT ${_modules} 0 ${deps} ${m}) |
|
|
|
set(_rev_deps "${deps};${m}") |
|
|
|
|
|
|
|
ocv_list_reverse(_rev_deps) |
|
|
|
|
|
|
|
foreach (dep ${_rev_deps}) |
|
|
|
|
|
|
|
if(DEFINED OPENCV_MODULE_${dep}_LOCATION) |
|
|
|
|
|
|
|
list(INSERT ${_modules} 0 ${dep}) |
|
|
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
endforeach() |
|
|
|
foreach (dep ${deps} ${OPENCV_LINKER_LIBS}) |
|
|
|
foreach (dep ${deps} ${OPENCV_LINKER_LIBS}) |
|
|
|
if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION) |
|
|
|
if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION) |
|
|
|
if (TARGET ${dep}) |
|
|
|
if (TARGET ${dep}) |
|
|
@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
# split 3rdparty libs and modules |
|
|
|
|
|
|
|
list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ocv_list_filterout(${_modules} "^[\$]<") |
|
|
|
ocv_list_filterout(${_modules} "^[\$]<") |
|
|
|
ocv_list_filterout(${_3rdparty} "^[\$]<") |
|
|
|
ocv_list_filterout(${_3rdparty} "^[\$]<") |
|
|
|
ocv_list_filterout(${_extra} "^[\$]<") |
|
|
|
ocv_list_filterout(${_extra} "^[\$]<") |
|
|
|