From d1e8651aaef2196103556021b0bb8024304e2326 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 15 Oct 2016 02:40:06 +0300 Subject: [PATCH] ios: disable IPPICV on i386-iPhoneSimulator --- cmake/OpenCVFindIPP.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake index 4317211..6913052 100644 --- a/cmake/OpenCVFindIPP.cmake +++ b/cmake/OpenCVFindIPP.cmake @@ -234,6 +234,12 @@ if(DEFINED ENV{OPENCV_IPP_PATH} AND NOT DEFINED IPPROOT) set(IPPROOT "$ENV{OPENCV_IPP_PATH}") endif() 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") if(DEFINED OPENCV_ICV_PATH) set(IPPROOT "${OPENCV_ICV_PATH}") -- 2.7.4