From 9d787afe72ef9d15af2f52081005292978b5fac8 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 13 May 2011 18:32:05 +0000
Subject: [PATCH] Small Android build fixes
---
CMakeLists.txt | 6 +++---
android/scripts/wincfg.cmd.tmpl | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b508ff2565..1de7c2c9dc 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 c43d2ee13c..f60c07a124 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
--
2.18.0