Skip to content

O
opencv
Commit 9c6d0637 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7490 from alalek:ios_disable_ippicv

parents de85680a d1e8651a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
cmake/OpenCVFindIPP.cmake
View file @ 9c6d0637
...@@ -234,6 +234,12 @@ if(DEFINED ENV{OPENCV_IPP_PATH} AND NOT DEFINED IPPROOT) ...@@ -234,6 +234,12 @@ if(DEFINED ENV{OPENCV_IPP_PATH} AND NOT DEFINED IPPROOT)
set(IPPROOT "$ENV{OPENCV_IPP_PATH}") set(IPPROOT "$ENV{OPENCV_IPP_PATH}")
endif() endif()
if(NOT DEFINED IPPROOT) if(NOT DEFINED IPPROOT)
if(IOS AND NOT x86_64)
# 2016/10: There is an issue with MacOS binary .a file.
# It is fat multiarch library, and can't be "merged" multiple times.
# So try to ignore i386 version
return()
endif()
include("${OpenCV_SOURCE_DIR}/3rdparty/ippicv/downloader.cmake") include("${OpenCV_SOURCE_DIR}/3rdparty/ippicv/downloader.cmake")
if(DEFINED OPENCV_ICV_PATH) if(DEFINED OPENCV_ICV_PATH)
set(IPPROOT "${OPENCV_ICV_PATH}") set(IPPROOT "${OPENCV_ICV_PATH}")
......
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