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

6 years ago · 8ecdd215b6
parent 5a3bca8d5c 3c5a6be835
commit 8ecdd215b6
1 changed files with 3 additions and 2 deletions
--- a/platforms/ios/build_framework.py
+++ b/platforms/ios/build_framework.py
@ -39,10 +39,11 @@ def execute(cmd, cwd = None):

 def getXCodeMajor():
    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:
        return int(m.group(1))
-    return 0
+    else:
+        raise Exception("Failed to parse Xcode version")

 class Builder:
    def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, targets):