Small Android build fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b508ff2..1de7c2c 100644 (file)
--- 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)\r
             set(OPENCV_LINKER_LIBS m pthread)\r
         elseif(ANDROID)\r
-            set(OPENCV_LINKER_LIBS dl m)\r
+            set(OPENCV_LINKER_LIBS dl m log)\r
         else()\r
             set(OPENCV_LINKER_LIBS dl m pthread rt)\r
         endif()\r
@@ -510,10 +510,10 @@ if (ANDROID)
   FIND_PACKAGE(NativeCamera QUIET)\r
   if(NativeCamera_FOUND)\r
     set(HAVE_ANDROID_NATIVE_CAMERA TRUE)\r
-    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS} log)\r
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS})\r
   else()\r
     set(HAVE_ANDROID_NATIVE_CAMERA FALSE)\r
-    message("-- Could NOT find NativeCamera for Android")\r
+    message(STATUS "Could NOT find NativeCamera for Android")\r
   endif()\r
 endif()\r
 \r

diff --git a/android/scripts/wincfg.cmd.tmpl b/android/scripts/wincfg.cmd.tmpl
index c43d2ee..f60c07a 100644 (file)
--- 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\r
 \r
 :::: uncomment following lines to compile for ARM-V7 with NEON support\r
-::SET ARM_TARGET="armeabi-v7a with NEON"\r
+::SET ARM_TARGET=armeabi-v7a with NEON\r
 ::SET BUILD_DIR=build_neon\r
 \r
 :::: other options\r