|
|
@ -181,6 +181,10 @@ foreach(__cvcomponent ${OpenCV_FIND_COMPONENTS}) |
|
|
|
set(${__cvcomponent}_FOUND "${__cvcomponent}_FOUND-NOTFOUND") |
|
|
|
set(${__cvcomponent}_FOUND "${__cvcomponent}_FOUND-NOTFOUND") |
|
|
|
else() |
|
|
|
else() |
|
|
|
list(APPEND OpenCV_FIND_COMPONENTS_ ${__cvcomponent}) |
|
|
|
list(APPEND OpenCV_FIND_COMPONENTS_ ${__cvcomponent}) |
|
|
|
|
|
|
|
# Not using list(APPEND) here, because OpenCV_LIBS may not exist yet. |
|
|
|
|
|
|
|
# Also not clearing OpenCV_LIBS anywhere, so that multiple calls |
|
|
|
|
|
|
|
# to find_package(OpenCV) with different component lists add up. |
|
|
|
|
|
|
|
set(OpenCV_LIBS ${OpenCV_LIBS} "${__cvcomponent}") |
|
|
|
#indicate that module is found |
|
|
|
#indicate that module is found |
|
|
|
string(TOUPPER "${__cvcomponent}" __cvcomponent) |
|
|
|
string(TOUPPER "${__cvcomponent}" __cvcomponent) |
|
|
|
set(${__cvcomponent}_FOUND 1) |
|
|
|
set(${__cvcomponent}_FOUND 1) |
|
|
@ -197,8 +201,6 @@ else() |
|
|
|
set(OpenCV_LIB_SUFFIX "") |
|
|
|
set(OpenCV_LIB_SUFFIX "") |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
SET(OpenCV_LIBS "${OpenCV_LIB_COMPONENTS}") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach(__opttype OPT DBG) |
|
|
|
foreach(__opttype OPT DBG) |
|
|
|
SET(OpenCV_LIBS_${__opttype} "${OpenCV_LIBS}") |
|
|
|
SET(OpenCV_LIBS_${__opttype} "${OpenCV_LIBS}") |
|
|
|
SET(OpenCV_EXTRA_LIBS_${__opttype} "") |
|
|
|
SET(OpenCV_EXTRA_LIBS_${__opttype} "") |
|
|
|