generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generators: updated the library gathering loop

Browse Source
This commit is contained in:
Maksim Shabunin 2015-04-08 14:15:20 +03:00
parent 979721c979
commit f803c2a7bb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/OpenCVUtils.cmake
View File

@ -798,17 +798,17 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
get_target_property(deps ${m} INTERFACE_LINK_LIBRARIES) get_target_property(deps ${m} INTERFACE_LINK_LIBRARIES)
list(INSERT ${_modules} 0 ${deps} ${m}) list(INSERT ${_modules} 0 ${deps} ${m})
foreach (dep ${deps} ${OPENCV_LINKER_LIBS}) foreach (dep ${deps} ${OPENCV_LINKER_LIBS})
if (TARGET ${dep}) if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION)
list(INSERT ${_3rdparty} 0 ${dep}) if (TARGET ${dep})
else() list(INSERT ${_3rdparty} 0 ${dep})
list(INSERT ${_extra} 0 ${dep}) else()
list(INSERT ${_extra} 0 ${dep})
endif()
endif() endif()
endforeach() endforeach()
endforeach() endforeach()
# split 3rdparty libs and modules # split 3rdparty libs and modules
ocv_list_filterout(${_3rdparty} "^opencv_.+$")
ocv_list_filterout(${_extra} "^opencv_.+$")
list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}}) list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}})
# convert CMake lists to makefile literals # convert CMake lists to makefile literals