Merge pull request #8688 from ysolovyov:num-jobs-fix

pull/8546/merge
Vadim Pisarevsky 8 years ago
commit 40d61e5c5b
  1. 4
      platforms/ios/build_framework.py
  2. 4
      platforms/osx/build_framework.py

@ -28,7 +28,7 @@ Adding --dynamic parameter will build opencv2.framework as App Store dynamic fra
""" """
from __future__ import print_function 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 from subprocess import check_call, check_output, CalledProcessError
def execute(cmd, cwd = None): def execute(cmd, cwd = None):
@ -166,7 +166,7 @@ class Builder:
"-sdk", target.lower(), "-sdk", target.lower(),
"-configuration", "Release", "-configuration", "Release",
"-parallelizeTargets", "-parallelizeTargets",
"-jobs", "4", "-jobs", str(multiprocessing.cpu_count()),
] + (["-target","ALL_BUILD"] if self.dynamic else []) ] + (["-target","ALL_BUILD"] if self.dynamic else [])
return buildcmd return buildcmd

@ -4,7 +4,7 @@ The script builds OpenCV.framework for OSX.
""" """
from __future__ import print_function from __future__ import print_function
import os, os.path, sys, argparse, traceback import os, os.path, sys, argparse, traceback, multiprocessing
# import common code # import common code
sys.path.insert(0, os.path.abspath(os.path.abspath(os.path.dirname(__file__))+'/../ios')) 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(), "-sdk", target.lower(),
"-configuration", "Release", "-configuration", "Release",
"-parallelizeTargets", "-parallelizeTargets",
"-jobs", "4" "-jobs", str(multiprocessing.cpu_count())
] ]
return buildcmd return buildcmd

Loading…
Cancel
Save