mirror of
https://github.com/opencv/opencv.git
synced 2025-06-13 04:52:53 +08:00
ios framework: refactor code (no functional changes)
This commit is contained in:
parent
007354ebaf
commit
a78d143c98
@ -122,37 +122,32 @@ class Builder:
|
|||||||
|
|
||||||
def getCMakeArgs(self, arch, target):
|
def getCMakeArgs(self, arch, target):
|
||||||
|
|
||||||
if self.dynamic:
|
args = [
|
||||||
args = [
|
"cmake",
|
||||||
"cmake",
|
"-GXcode",
|
||||||
"-GXcode",
|
"-DAPPLE_FRAMEWORK=ON",
|
||||||
"-DAPPLE_FRAMEWORK=ON",
|
"-DCMAKE_INSTALL_PREFIX=install",
|
||||||
"-DCMAKE_INSTALL_PREFIX=install",
|
"-DCMAKE_BUILD_TYPE=Release",
|
||||||
"-DCMAKE_BUILD_TYPE=Release",
|
] + ([
|
||||||
"-DBUILD_SHARED_LIBS=ON",
|
"-DBUILD_SHARED_LIBS=ON",
|
||||||
"-DCMAKE_MACOSX_BUNDLE=ON",
|
"-DCMAKE_MACOSX_BUNDLE=ON",
|
||||||
"-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO",
|
"-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO",
|
||||||
]
|
] if self.dynamic else [])
|
||||||
else:
|
|
||||||
args = [
|
|
||||||
"cmake",
|
|
||||||
"-GXcode",
|
|
||||||
"-DAPPLE_FRAMEWORK=ON",
|
|
||||||
"-DCMAKE_INSTALL_PREFIX=install",
|
|
||||||
"-DCMAKE_BUILD_TYPE=Release",
|
|
||||||
]
|
|
||||||
|
|
||||||
if len(self.exclude) > 0:
|
if len(self.exclude) > 0:
|
||||||
args += ["-DBUILD_opencv_world=OFF"]
|
args += ["-DBUILD_opencv_world=OFF"]
|
||||||
args += ("-DBUILD_opencv_%s=OFF" % m for m in self.exclude)
|
args += ["-DBUILD_opencv_%s=OFF" % m for m in self.exclude]
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def getBuildCommand(self, archs, target):
|
def getBuildCommand(self, archs, target):
|
||||||
|
|
||||||
|
buildcmd = [
|
||||||
|
"xcodebuild",
|
||||||
|
]
|
||||||
|
|
||||||
if self.dynamic:
|
if self.dynamic:
|
||||||
buildcmd = [
|
buildcmd += [
|
||||||
"xcodebuild",
|
|
||||||
"IPHONEOS_DEPLOYMENT_TARGET=8.0",
|
"IPHONEOS_DEPLOYMENT_TARGET=8.0",
|
||||||
"ONLY_ACTIVE_ARCH=NO",
|
"ONLY_ACTIVE_ARCH=NO",
|
||||||
]
|
]
|
||||||
@ -160,25 +155,19 @@ class Builder:
|
|||||||
for arch in archs:
|
for arch in archs:
|
||||||
buildcmd.append("-arch")
|
buildcmd.append("-arch")
|
||||||
buildcmd.append(arch.lower())
|
buildcmd.append(arch.lower())
|
||||||
|
else:
|
||||||
|
arch = ";".join(archs)
|
||||||
buildcmd += [
|
buildcmd += [
|
||||||
|
"IPHONEOS_DEPLOYMENT_TARGET=6.0",
|
||||||
|
"ARCHS=%s" % arch,
|
||||||
|
]
|
||||||
|
|
||||||
|
buildcmd += [
|
||||||
"-sdk", target.lower(),
|
"-sdk", target.lower(),
|
||||||
"-configuration", "Release",
|
"-configuration", "Release",
|
||||||
"-parallelizeTargets",
|
"-parallelizeTargets",
|
||||||
"-jobs", "4",
|
"-jobs", "4",
|
||||||
"-target","ALL_BUILD",
|
] + (["-target","ALL_BUILD"] if self.dynamic else [])
|
||||||
]
|
|
||||||
else:
|
|
||||||
arch = ";".join(archs)
|
|
||||||
buildcmd = [
|
|
||||||
"xcodebuild",
|
|
||||||
"IPHONEOS_DEPLOYMENT_TARGET=6.0",
|
|
||||||
"ARCHS=%s" % arch,
|
|
||||||
"-sdk", target.lower(),
|
|
||||||
"-configuration", "Release",
|
|
||||||
"-parallelizeTargets",
|
|
||||||
"-jobs", "4"
|
|
||||||
]
|
|
||||||
|
|
||||||
return buildcmd
|
return buildcmd
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user