iOS framework build script changes from master branch

This commit is contained in:
Maksim Shabunin 2014-10-21 15:41:02 +04:00
parent 09fb7512ed
commit 0c3722be82

View File

@ -15,7 +15,7 @@ Script will create <outputdir>, if it's missing, and a few its subdirectories:
build/ build/
iPhoneOS-*/ iPhoneOS-*/
[cmake-generated build tree for an iOS device target] [cmake-generated build tree for an iOS device target]
iPhoneSimulator/ iPhoneSimulator-*/
[cmake-generated build tree for iOS simulator] [cmake-generated build tree for iOS simulator]
opencv2.framework/ opencv2.framework/
[the framework content] [the framework content]
@ -53,7 +53,11 @@ def build_opencv(srcroot, buildroot, target, arch):
"-DBUILD_opencv_world=ON " + "-DBUILD_opencv_world=ON " +
"-DCMAKE_C_FLAGS=\"-Wno-implicit-function-declaration\" " + "-DCMAKE_C_FLAGS=\"-Wno-implicit-function-declaration\" " +
"-DCMAKE_INSTALL_PREFIX=install") % (srcroot, target) "-DCMAKE_INSTALL_PREFIX=install") % (srcroot, target)
# if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary
if arch.startswith("armv"):
cmakeargs += " -DENABLE_NEON=ON"
# if cmake cache exists, just rerun cmake to update OpenCV.xcodeproj if necessary
if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")): if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")):
execute("cmake %s ." % (cmakeargs,)) execute("cmake %s ." % (cmakeargs,))
else: else: