|
|
@ -824,12 +824,18 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) |
|
|
|
list(FIND ${_extra} "ippicv" ippicv_idx) |
|
|
|
list(FIND ${_extra} "ippicv" ippicv_idx) |
|
|
|
if (${ippicv_idx} GREATER -1) |
|
|
|
if (${ippicv_idx} GREATER -1) |
|
|
|
list(REMOVE_ITEM ${_extra} "ippicv") |
|
|
|
list(REMOVE_ITEM ${_extra} "ippicv") |
|
|
|
list(INSERT ${_3rdparty} 0 "ippicv") |
|
|
|
if(NOT BUILD_SHARED_LIBS) |
|
|
|
|
|
|
|
list(INSERT ${_3rdparty} 0 "ippicv") |
|
|
|
|
|
|
|
endif() |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
# split 3rdparty libs and modules |
|
|
|
# split 3rdparty libs and modules |
|
|
|
list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list) |
|
|
|
list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ocv_list_filterout(${_modules} "^[\$]<") |
|
|
|
|
|
|
|
ocv_list_filterout(${_3rdparty} "^[\$]<") |
|
|
|
|
|
|
|
ocv_list_filterout(${_extra} "^[\$]<") |
|
|
|
|
|
|
|
|
|
|
|
# convert CMake lists to makefile literals |
|
|
|
# convert CMake lists to makefile literals |
|
|
|
foreach(lst ${_modules} ${_3rdparty} ${_extra}) |
|
|
|
foreach(lst ${_modules} ${_3rdparty} ${_extra}) |
|
|
|
ocv_list_unique(${lst}) |
|
|
|
ocv_list_unique(${lst}) |
|
|
|