Merge pull request #5924 from Photonomie:release/3.1.0-patched

This commit is contained in:
Alexander Alekhin 2016-01-11 11:11:45 +00:00
commit 22acd964cb

View File

@ -126,7 +126,7 @@ class Builder:
toolchain = self.getToolchain(arch, target) toolchain = self.getToolchain(arch, target)
cmakecmd = self.getCMakeArgs(arch, target) + \ cmakecmd = self.getCMakeArgs(arch, target) + \
(["-DCMAKE_TOOLCHAIN_FILE=%s" % toolchain] if toolchain is not None else []) (["-DCMAKE_TOOLCHAIN_FILE=%s" % toolchain] if toolchain is not None else [])
if arch.startswith("armv"): if arch.startswith("armv") or arch.startswith("arm64"):
cmakecmd.append("-DENABLE_NEON=ON") cmakecmd.append("-DENABLE_NEON=ON")
cmakecmd.append(self.opencv) cmakecmd.append(self.opencv)
cmakecmd.extend(cmakeargs) cmakecmd.extend(cmakeargs)