Skip to content

O
opencv-python

OpenCV / opencv-python
11 个月 前同步成功

通知 230
Star 3707
Fork 754
O
opencv-python

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 3073e9ee 编写于 作者: O Olli-Pekka Heinisuo 提交者： GitHub
浏览文件
操作

Merge pull request #315 from uSpike/patch-1 

Only patch when called with "bdist_wheel"
上级 35755449 cca2a16e
隐藏空白更改
内联 并排
Showing with 4 addition and 2 deletion
setup.py
浏览文件 @ 3073e9ee
...@@ -148,7 +148,8 @@ def main(): ...@@ -148,7 +148,8 @@ def main():
# https://github.com/skvark/opencv-python/issues/21 # https://github.com/skvark/opencv-python/issues/21
cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++") cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++")
cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9") cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9")
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True) if "bdist_wheel" in sys.argv:
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):
cmake_args.append("-DWITH_IPP=OFF") # tests fail with IPP compiled with cmake_args.append("-DWITH_IPP=OFF") # tests fail with IPP compiled with
...@@ -157,7 +158,8 @@ def main(): ...@@ -157,7 +158,8 @@ def main():
if sys.platform.startswith('linux') and not x64: if sys.platform.startswith('linux') and not x64:
cmake_args.append("-DCMAKE_CXX_FLAGS=-U__STRICT_ANSI__") cmake_args.append("-DCMAKE_CXX_FLAGS=-U__STRICT_ANSI__")
# patch openEXR when building on i386, see: https://github.com/openexr/openexr/issues/128 # patch openEXR when building on i386, see: https://github.com/openexr/openexr/issues/128
subprocess.check_call("patch -p0 < patches/patchOpenEXR", shell=True) if "bdist_wheel" in sys.argv:
subprocess.check_call("patch -p0 < patches/patchOpenEXR", shell=True)
if 'CMAKE_ARGS' in os.environ: if 'CMAKE_ARGS' in os.environ:
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或