mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-29 12:50:51 +00:00
commit 8ecdd215b6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platforms/ios/build_framework.py
View File

@ -39,10 +39,11 @@ def execute(cmd, cwd = None):
def getXCodeMajor(): def getXCodeMajor():
ret = check_output(["xcodebuild", "-version"]) ret = check_output(["xcodebuild", "-version"])
m = re.match(r'XCode\s+(\d)\..*', ret, flags=re.IGNORECASE) m = re.match(r'Xcode\s+(\d+)\..*', ret, flags=re.IGNORECASE)
if m: if m:
return int(m.group(1)) return int(m.group(1))
return 0 else:
raise Exception("Failed to parse Xcode version")
class Builder: class Builder:
def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, targets): def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, targets):