potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-07 12:40:27 +03:00
parent 4a73b4859f f3fae0dae0
commit 73bfe68821
141 changed files with 3074 additions and 4777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/ios/build_framework.py
Regular → Executable
+1 -1
View File
@@ -183,7 +183,7 @@ class Builder:
cmakecmd = self.getCMakeArgs(arch, target) + \
(["-DCMAKE_TOOLCHAIN_FILE=%s" % toolchain] if toolchain is not None else [])
if target.lower().startswith("iphoneos"):
cmakecmd.append("-DENABLE_NEON=ON")
cmakecmd.append("-DCPU_BASELINE=NEON;FP16")
cmakecmd.append(self.opencv)
cmakecmd.extend(cmakeargs)
execute(cmakecmd, cwd = builddir)