potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33: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
2020-09-28 21:33:29 +00:00
parent 8da1b9aafa 08b36e4f48
commit 295afd5882
12 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/ios/build_framework.py
-1
View File
@@ -183,7 +183,6 @@ class Builder:
] if self.debug_info else [])
if len(self.exclude) > 0:
args += ["-DBUILD_opencv_world=OFF"] if not (self.dynamic and not self.build_objc_wrapper) else []
args += ["-DBUILD_opencv_%s=OFF" % m for m in self.exclude]
if len(self.disable) > 0: