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

Merge pull request #2741 from alalek:icv_android

Browse Source
This commit is contained in:
Roman Donchenko 2014-05-19 15:04:36 +04:00 committed by OpenCV Buildbot
commit 9eac451a3a
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3rdparty/ippicv/downloader.cmake vendored
View File

@ -12,9 +12,12 @@ function(_icv_downloader)
set(OPENCV_ICV_PACKAGE_HASH "f2195a60829899983acd4a45794e1717") set(OPENCV_ICV_PACKAGE_HASH "f2195a60829899983acd4a45794e1717")
set(OPENCV_ICV_PLATFORM "macosx") set(OPENCV_ICV_PLATFORM "macosx")
set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_osx") set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_osx")
elseif(UNIX AND NOT ANDROID) elseif(UNIX)
set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20140429.tgz") if(ANDROID AND (NOT ANDROID_ABI STREQUAL x86))
set(OPENCV_ICV_PACKAGE_HASH "f6481b8695a56ad27a84db1e44ea0f00") 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_PLATFORM "linux")
set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_lnx") set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_lnx")
elseif(WIN32 AND NOT ARM) elseif(WIN32 AND NOT ARM)

29
cmake/OpenCVFindIPP.cmake
View File

@ -206,32 +206,9 @@ if(NOT DEFINED IPPROOT)
endif() endif()
endif() endif()
# Try ICV file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)
find_path( if(EXISTS "${__IPPROOT}/include/ippversion.h")
IPP_ICV_H_PATH set(IPP_ROOT_DIR ${__IPPROOT})
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)
ipp_detect_version() ipp_detect_version()
endif() endif()