diff --git a/CMakeLists.txt b/CMakeLists.txt index b508ff256..1de7c2c9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/android/scripts/wincfg.cmd.tmpl b/android/scripts/wincfg.cmd.tmpl index c43d2ee13..f60c07a12 100644 --- a/android/scripts/wincfg.cmd.tmpl +++ b/android/scripts/wincfg.cmd.tmpl @@ -19,7 +19,7 @@ SET BUILD_DIR=build ::SET BUILD_DIR=build_armeabi :::: uncomment following lines to compile for ARM-V7 with NEON support -::SET ARM_TARGET="armeabi-v7a with NEON" +::SET ARM_TARGET=armeabi-v7a with NEON ::SET BUILD_DIR=build_neon :::: other options