From: Vadim Pisarevsky Date: Wed, 3 May 2017 10:25:54 +0000 (+0000) Subject: Merge pull request #8688 from ysolovyov:num-jobs-fix X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1039 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40d61e5c5b2d0fa7faa8a57429ab89ff117a6ca6;hp=2a5a143f0fa636f796c950cb9845c9ba5b651e32;p=platform%2Fupstream%2Fopencv.git Merge pull request #8688 from ysolovyov:num-jobs-fix --- diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py index a09c2fa..78d9ec6 100644 --- a/platforms/ios/build_framework.py +++ b/platforms/ios/build_framework.py @@ -28,7 +28,7 @@ Adding --dynamic parameter will build opencv2.framework as App Store dynamic fra """ from __future__ import print_function -import glob, re, os, os.path, shutil, string, sys, argparse, traceback +import glob, re, os, os.path, shutil, string, sys, argparse, traceback, multiprocessing from subprocess import check_call, check_output, CalledProcessError def execute(cmd, cwd = None): @@ -166,7 +166,7 @@ class Builder: "-sdk", target.lower(), "-configuration", "Release", "-parallelizeTargets", - "-jobs", "4", + "-jobs", str(multiprocessing.cpu_count()), ] + (["-target","ALL_BUILD"] if self.dynamic else []) return buildcmd diff --git a/platforms/osx/build_framework.py b/platforms/osx/build_framework.py index 6e23931..2db5cd2 100644 --- a/platforms/osx/build_framework.py +++ b/platforms/osx/build_framework.py @@ -4,7 +4,7 @@ The script builds OpenCV.framework for OSX. """ from __future__ import print_function -import os, os.path, sys, argparse, traceback +import os, os.path, sys, argparse, traceback, multiprocessing # import common code sys.path.insert(0, os.path.abspath(os.path.abspath(os.path.dirname(__file__))+'/../ios')) @@ -23,7 +23,7 @@ class OSXBuilder(Builder): "-sdk", target.lower(), "-configuration", "Release", "-parallelizeTargets", - "-jobs", "4" + "-jobs", str(multiprocessing.cpu_count()) ] return buildcmd