From 6f798b1ba7c720146099526824f677676796e628 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Tue, 13 May 2014 15:09:10 +0400
Subject: [PATCH] icv: android x86 build
---
3rdparty/ippicv/downloader.cmake | 9 ++++++---
cmake/OpenCVFindIPP.cmake | 29 +++--------------------------
2 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake
index 3e830fe7ef..38e6c7b2da 100644
--- a/3rdparty/ippicv/downloader.cmake
+++ b/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)
diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake
index 31d64abe56..fd8346afac 100644
--- a/cmake/OpenCVFindIPP.cmake
+++ b/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()