mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 08:19:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2636 from atrebbi:#3653

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-05 18:00:17 +04:00 committed by OpenCV Buildbot
commit 59cf62ad9e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/world/CMakeLists.txt
View File

@ -103,6 +103,7 @@ macro(ios_include_3party_libs)
list(APPEND objlist "\"${objpath3}\"") list(APPEND objlist "\"${objpath3}\"")
endforeach() # (srcname ${sources}) endforeach() # (srcname ${sources})
endforeach() endforeach()
ocv_list_filterout(objlist jmemansi) # <<= dirty fix
endmacro() endmacro()
if(IOS AND WITH_PNG) if(IOS AND WITH_PNG)

1
platforms/ios/build_framework.py
View File

@ -40,6 +40,7 @@ def build_opencv(srcroot, buildroot, target, arch):
"-DCMAKE_BUILD_TYPE=Release " + "-DCMAKE_BUILD_TYPE=Release " +
"-DCMAKE_TOOLCHAIN_FILE=%s/platforms/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake " + "-DCMAKE_TOOLCHAIN_FILE=%s/platforms/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake " +
"-DBUILD_opencv_world=ON " + "-DBUILD_opencv_world=ON " +
"-DCMAKE_C_FLAGS=\"-Wno-implicit-function-declaration\" " +
"-DCMAKE_INSTALL_PREFIX=install") % (srcroot, target) "-DCMAKE_INSTALL_PREFIX=install") % (srcroot, target)
# if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary # if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary
if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")): if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")):