Android cmake toolchain file is included into OpenCV

CMakeLists.txt

@@ -446,6 +446,7 @@ if(UNIX)
             set(HAVE_XINE FALSE)
         endif()
         if(WITH_V4L)
+
             CHECK_MODULE(libv4l1 HAVE_LIBV4L)
             CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
             CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)

OpenCVConfig.cmake.in

@@ -57,7 +57,7 @@ if(NOT ANDROID)
     set(OPENCV_LIB_COMPONENTS opencv_core opencv_imgproc opencv_features2d opencv_gpu opencv_calib3d opencv_objdetect opencv_video opencv_highgui opencv_ml opencv_legacy opencv_contrib opencv_flann)
 else()
     #libraries order is very important because linker from Android NDK is one-pass linker
-    set(OPENCV_LIB_COMPONENTS opencv_calib3d opencv_objdetect opencv_features2d opencv_imgproc opencv_video  opencv_highgui opencv_ml opencv_legacy  opencv_flann opencv_core )
+    set(OPENCV_LIB_COMPONENTS opencv_contrib opencv_calib3d opencv_objdetect opencv_features2d opencv_imgproc opencv_video  opencv_highgui opencv_ml opencv_legacy  opencv_flann opencv_core )
 endif()
 
 SET(OpenCV_LIBS "")

OpenCVModule.cmake

@@ -22,6 +22,9 @@ macro(define_opencv_module name)
 
     file(GLOB lib_srcs "src/*.cpp")
     file(GLOB lib_int_hdrs "src/*.h*")
+    if(COMMAND get_module_external_sources)
+       get_module_external_sources(${name})
+    endif()
     source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
 
     file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")

android/CMakeCache.android.initial.cmake

@@ -89,19 +89,19 @@ set(WITH_V4L OFF CACHE BOOL "" )
 set(WITH_XINE OFF CACHE BOOL "" )
 
 #Enable SSE instructions
-SET( ENABLE_SSE OFF CACHE BOOL "" )
+SET( ENABLE_SSE OFF CACHE INTERNAL "" FORCE )
 
 #Enable SSE2 instructions
-SET( ENABLE_SSE2 OFF CACHE BOOL "" )
+SET( ENABLE_SSE2 OFF CACHE INTERNAL "" FORCE )
 
 #Enable SSE3 instructions
-SET( ENABLE_SSE3 OFF CACHE BOOL "" )
+SET( ENABLE_SSE3 OFF CACHE INTERNAL "" FORCE )
 
 #Enable SSE4.1 instructions
-SET( ENABLE_SSE41 OFF CACHE BOOL "" )
+SET( ENABLE_SSE41 OFF CACHE INTERNAL "" FORCE )
 
 #Enable SSE4.2 instructions
-SET( ENABLE_SSE42 OFF CACHE BOOL "" )
+SET( ENABLE_SSE42 OFF CACHE INTERNAL "" FORCE )
 
 #Enable SSSE3 instructions
-SET( ENABLE_SSSE3 OFF CACHE BOOL "" )
+SET( ENABLE_SSSE3 OFF CACHE INTERNAL "" FORCE )

android/cmake_android_armeabi.sh

-mkdir build_armeabi
-cd build_armeabi
-cmake -C ../CMakeCache.android.initial.cmake -DARM_TARGETS=armeabi -DCMAKE_TOOLCHAIN_FILE=$ANDTOOLCHAIN ../..
-

android/cmake_android_neon.sh

-mkdir build_neon
-cd build_neon
-cmake -C ../CMakeCache.android.initial.cmake -DARM_TARGETS="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=$ANDTOOLCHAIN ../..
-

android/scripts/cmake_android.cmd

+cd %~dp0\..
+
+::rmdir /S /Q build
+mkdir build 2>null
+
+SET ANDROID_NDK=C:\apps\android-ndk-r5b
+SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe
+SET MAKE_EXE=C:\apps\gnuport\make.exe
+
+cd build
+%CMAKE_EXE% -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\..

android/cmake_android.sh → android/scripts/cmake_android.sh

-mkdir build
+#!/bin/sh
+cd `dirname $0`/..
+
+mkdir -p build
 cd build
-cmake -C ../CMakeCache.android.initial.cmake -DCMAKE_TOOLCHAIN_FILE=$ANDTOOLCHAIN ../..
+
+cmake -C ../CMakeCache.android.initial.cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake ../..
 

android/scripts/cmake_android_armeabi.cmd

+cd %~dp0\..
+
+::rmdir /S /Q build
+mkdir build 2>null
+
+SET ANDROID_NDK=C:\apps\android-ndk-r5b
+SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe
+SET MAKE_EXE=C:\apps\gnuport\make.exe
+
+cd build
+%CMAKE_EXE% -G"Unix Makefiles" -DARM_TARGET=armeabi -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\..

android/scripts/cmake_android_armeabi.sh

+#!/bin/sh
+cd `dirname $0`/..
+
+mkdir -p build_armeabi
+cd build_armeabi
+
+cmake -C ../CMakeCache.android.initial.cmake -DARM_TARGET=armeabi -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake ../..
+

android/scripts/cmake_android_neon.cmd

+cd %~dp0\..
+
+::rmdir /S /Q build
+mkdir build 2>null
+
+SET ANDROID_NDK=C:\apps\android-ndk-r5b
+SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe
+SET MAKE_EXE=C:\apps\gnuport\make.exe
+
+cd build
+%CMAKE_EXE% -G"Unix Makefiles" -DARM_TARGET="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\..

android/scripts/cmake_android_neon.sh

+#!/bin/sh
+cd `dirname $0`/..
+
+mkdir -p build_neon
+cd build_neon
+
+cmake -C ../CMakeCache.android.initial.cmake -DARM_TARGET="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake ../..
+

modules/CMakeLists.txt

-if (ANDROID)
+if(ANDROID)
   ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0)
-  ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
+  if(ANDROID_API_LEVEL LESS 8)
+    ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
+  endif()
 endif()
 
 add_subdirectory(calib3d)

modules/core/include/opencv2/core/internal.hpp

@@ -119,6 +119,13 @@ CV_INLINE IppiSize ippiSize(int width, int height)
 #define CV_SSE3 0
 #endif
 
+#if defined ANDROID && defined __ARM_NEON__
+#include "arm_neon.h"
+#define CV_NEON 1
+#else
+#define CV_NEON 0
+#endif
+
 #ifndef IPPI_CALL
 #define IPPI_CALL(func) CV_Assert((func) >= 0)
 #endif

modules/highgui/CMakeLists.txt

@@ -216,6 +216,14 @@ if(HAVE_ANDROID_NATIVE_CAMERA)
   add_definitions(-DHAVE_ANDROID_NATIVE_CAMERA)
 endif()
 
+if(COMMAND get_module_external_sources)
+    set( lib_srcs "${highgui_srcs}" )
+    set( lib_int_hdrs "${highgui_hdrs}" )
+    get_module_external_sources(highgui)
+    set( highgui_srcs "${lib_srcs}" )
+    set( highgui_hdrs "${lib_int_hdrs}" )
+endif()
+
 source_group("Src" FILES ${highgui_srcs} ${highgui_hdrs})
 source_group("Include" FILES ${highgui_ext_hdrs})