From c122b7e114d619616750dcc322cf23df9081b6be Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Sat, 30 Apr 2011 10:38:24 +0000
Subject: [PATCH] Fixed tests compilation issue with low Android API levels.
 OpenCV successfully compiles for API level 3 and above. Enable tests for
 Android by default.

---
 android/CMakeCache.android.initial.cmake |  3 ---
 modules/CMakeLists.txt                   | 11 ++++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/android/CMakeCache.android.initial.cmake b/android/CMakeCache.android.initial.cmake
index be8c492b76..0a7191dc00 100644
--- a/android/CMakeCache.android.initial.cmake
+++ b/android/CMakeCache.android.initial.cmake
@@ -24,9 +24,6 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" )
 #Build 3rd party libraries
 set(OPENCV_BUILD_3RDPARTY_LIBS ON CACHE BOOL "" )
 
-#Build tests
-set(BUILD_TESTS OFF CACHE BOOL "" )
-
 #Choose the type of build, options are: None Debug Release RelWithDebInfo
 # MinSizeRel.
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" )
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 4a5a699ab1..a44c38a6d1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,5 +1,6 @@
 if (ANDROID)
   ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0)
+  ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
 endif()
 
 add_subdirectory(calib3d)
@@ -14,7 +15,7 @@ if(MSVC OR MINGW)
 endif()
 
 if(BUILD_TESTS)
-add_subdirectory(ts)
+  add_subdirectory(ts)
 endif()
 add_subdirectory(highgui)
 add_subdirectory(imgproc)
@@ -24,7 +25,7 @@ add_subdirectory(ml)
 add_subdirectory(objdetect)
 
 if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
-    add_subdirectory(python)
+  add_subdirectory(python)
 endif()
 
 add_subdirectory(video)
@@ -32,9 +33,5 @@ add_subdirectory(traincascade)
 add_subdirectory(haartraining)
 
 if(NOT ANDROID)
-add_subdirectory(gpu)
+  add_subdirectory(gpu)
 endif()
-
-
-
-