From 3d25d706279b1b7859d4a62d715b637451b8d066 Mon Sep 17 00:00:00 2001 From: Alessandro Trebbi Date: Fri, 18 Apr 2014 13:42:47 +0200 Subject: [PATCH] fix for compiling 2.4 opencv with xcode 5.1 --- modules/world/CMakeLists.txt | 1 + platforms/ios/build_framework.py | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/world/CMakeLists.txt b/modules/world/CMakeLists.txt index f65447dc0..6a84c1b6a 100644 --- a/modules/world/CMakeLists.txt +++ b/modules/world/CMakeLists.txt @@ -103,6 +103,7 @@ macro(ios_include_3party_libs) list(APPEND objlist "\"${objpath3}\"") endforeach() # (srcname ${sources}) endforeach() + ocv_list_filterout(objlist jmemansi) # <<= dirty fix endmacro() if(IOS AND WITH_PNG) diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py index e9a68c32f..4d4f7e3d0 100755 --- a/platforms/ios/build_framework.py +++ b/platforms/ios/build_framework.py @@ -40,6 +40,7 @@ def build_opencv(srcroot, buildroot, target, arch): "-DCMAKE_BUILD_TYPE=Release " + "-DCMAKE_TOOLCHAIN_FILE=%s/platforms/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake " + "-DBUILD_opencv_world=ON " + + "-DCMAKE_C_FLAGS=\"-Wno-implicit-function-declaration\" " + "-DCMAKE_INSTALL_PREFIX=install") % (srcroot, target) # if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")):