Merge pull request #2741 from alalek:icv_android

3rdparty/ippicv/downloader.cmake

@@ -12,9 +12,12 @@ function(_icv_downloader)
     set(OPENCV_ICV_PACKAGE_HASH "f2195a60829899983acd4a45794e1717")
     set(OPENCV_ICV_PLATFORM "macosx")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_osx")
-  elseif(UNIX AND NOT ANDROID)
-    set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20140429.tgz")
-    set(OPENCV_ICV_PACKAGE_HASH "f6481b8695a56ad27a84db1e44ea0f00")
+  elseif(UNIX)
+    if(ANDROID AND (NOT ANDROID_ABI STREQUAL x86))
+      return()
+    endif()
+    set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20140513.tgz")
+    set(OPENCV_ICV_PACKAGE_HASH "d80cb24f3a565113a9d6dc56344142f6")
     set(OPENCV_ICV_PLATFORM "linux")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_lnx")
   elseif(WIN32 AND NOT ARM)

cmake/OpenCVFindIPP.cmake

@@ -206,32 +206,9 @@ if(NOT DEFINED IPPROOT)
   endif()
 endif()
 
-# Try ICV
-find_path(
-    IPP_ICV_H_PATH
-    NAMES ippicv.h
-    PATHS ${IPPROOT}
-    DOC "The path to Intel(R) IPP ICV header files"
-    NO_DEFAULT_PATH
-    NO_CMAKE_PATH)
-set(IPP_ROOT_DIR ${IPP_ICV_H_PATH})
-
-if(NOT IPP_ICV_H_PATH)
-  # Try standalone IPP
-  find_path(
-      IPP_H_PATH
-      NAMES ippversion.h
-      PATHS ${IPPROOT}
-      PATH_SUFFIXES include
-      DOC "The path to Intel(R) IPP header files"
-      NO_DEFAULT_PATH
-      NO_CMAKE_PATH)
-  if(IPP_H_PATH)
-    get_filename_component(IPP_ROOT_DIR ${IPP_H_PATH} PATH)
-  endif()
-endif()
-
-if(IPP_ROOT_DIR)
+file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)
+if(EXISTS "${__IPPROOT}/include/ippversion.h")
+  set(IPP_ROOT_DIR ${__IPPROOT})
   ipp_detect_version()
 endif()