Commit c122b7e1 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed tests compilation issue with low Android API levels. OpenCV successfully…

Fixed tests compilation issue with low Android API levels. OpenCV successfully compiles for API level 3 and above.
Enable tests for Android by default.
parent 17b11a47
...@@ -24,9 +24,6 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" ) ...@@ -24,9 +24,6 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" )
#Build 3rd party libraries #Build 3rd party libraries
set(OPENCV_BUILD_3RDPARTY_LIBS ON CACHE BOOL "" ) 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 #Choose the type of build, options are: None Debug Release RelWithDebInfo
# MinSizeRel. # MinSizeRel.
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" ) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" )
......
if (ANDROID) if (ANDROID)
ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0) ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0)
ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
endif() endif()
add_subdirectory(calib3d) add_subdirectory(calib3d)
...@@ -14,7 +15,7 @@ if(MSVC OR MINGW) ...@@ -14,7 +15,7 @@ if(MSVC OR MINGW)
endif() endif()
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(ts) add_subdirectory(ts)
endif() endif()
add_subdirectory(highgui) add_subdirectory(highgui)
add_subdirectory(imgproc) add_subdirectory(imgproc)
...@@ -24,7 +25,7 @@ add_subdirectory(ml) ...@@ -24,7 +25,7 @@ add_subdirectory(ml)
add_subdirectory(objdetect) add_subdirectory(objdetect)
if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT) if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
add_subdirectory(python) add_subdirectory(python)
endif() endif()
add_subdirectory(video) add_subdirectory(video)
...@@ -32,9 +33,5 @@ add_subdirectory(traincascade) ...@@ -32,9 +33,5 @@ add_subdirectory(traincascade)
add_subdirectory(haartraining) add_subdirectory(haartraining)
if(NOT ANDROID) if(NOT ANDROID)
add_subdirectory(gpu) add_subdirectory(gpu)
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment