generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed tests compilation issue with low Android API levels. OpenCV successfully compiles for API level 3 and above.

Browse Source 
Enable tests for Android by default.
This commit is contained in:
Andrey Kamaev 2011-04-30 10:38:24 +00:00
parent 17b11a47bf
commit c122b7e114
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/CMakeCache.android.initial.cmake
View File

@ -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 "" )

11
modules/CMakeLists.txt
View File

@ -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()