|
|
|
@ -479,7 +479,7 @@ if(UNIX) |
|
|
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" AND NOT ANDROID) |
|
|
|
|
set(OPENCV_LINKER_LIBS m pthread) |
|
|
|
|
elseif(ANDROID) |
|
|
|
|
set(OPENCV_LINKER_LIBS dl m) |
|
|
|
|
set(OPENCV_LINKER_LIBS dl m log) |
|
|
|
|
else() |
|
|
|
|
set(OPENCV_LINKER_LIBS dl m pthread rt) |
|
|
|
|
endif() |
|
|
|
@ -510,10 +510,10 @@ if (ANDROID) |
|
|
|
|
FIND_PACKAGE(NativeCamera QUIET) |
|
|
|
|
if(NativeCamera_FOUND) |
|
|
|
|
set(HAVE_ANDROID_NATIVE_CAMERA TRUE) |
|
|
|
|
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS} log) |
|
|
|
|
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS}) |
|
|
|
|
else() |
|
|
|
|
set(HAVE_ANDROID_NATIVE_CAMERA FALSE) |
|
|
|
|
message("-- Could NOT find NativeCamera for Android") |
|
|
|
|
message(STATUS "Could NOT find NativeCamera for Android") |
|
|
|
|
endif() |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|