Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Richard 祝发兴 - -IT
opencv-python
提交
a145e59b
O
opencv-python
项目概览
Richard 祝发兴 - -IT
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a145e59b
编写于
8月 22, 2019
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update ffmpeg dll name
上级
288a9d34
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
5 deletion
+5
-5
setup.py
setup.py
+5
-5
未找到文件。
setup.py
浏览文件 @
a145e59b
...
...
@@ -76,7 +76,7 @@ def main():
# Path regexes with forward slashes relative to CMake install dir.
rearrange_cmake_output_data
=
{
'cv2'
:
([
r
'bin/opencv_ffmpeg\d{3}%s\.dll'
%
(
'_64'
if
x64
else
''
)]
if
os
.
name
==
'nt'
else
[])
+
'cv2'
:
([
r
'bin/opencv_
videoio_
ffmpeg\d{3}%s\.dll'
%
(
'_64'
if
x64
else
''
)]
if
os
.
name
==
'nt'
else
[])
+
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
# Naming conventions vary so widely between versions and OSes
# had to give up on checking them.
...
...
@@ -102,7 +102,7 @@ def main():
# skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
"-DPYTHON%d_EXECUTABLE=%s"
%
(
sys
.
version_info
[
0
],
sys
.
executable
),
"-DBUILD_opencv_python%d=ON"
%
sys
.
version_info
[
0
],
# When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
,
# Relative dir to install the built module to in the build tree.
...
...
@@ -111,7 +111,7 @@ def main():
# Otherwise, opencv scripts would want to install `.pyd' right into site-packages,
# and skbuild bails out on seeing that
"-DINSTALL_CREATE_DISTRIB=ON"
,
# See opencv/CMakeLists.txt for options and defaults
"-DBUILD_opencv_apps=OFF"
,
"-DBUILD_SHARED_LIBS=OFF"
,
...
...
@@ -147,12 +147,12 @@ def main():
if
sys
.
platform
.
startswith
(
'linux'
)
and
not
x64
:
cmake_args
.
append
(
"-DCMAKE_CXX_FLAGS=-U__STRICT_ANSI__"
)
if
'CMAKE_ARGS'
in
os
.
environ
:
import
shlex
cmake_args
.
extend
(
shlex
.
split
(
os
.
environ
[
'CMAKE_ARGS'
]))
del
shlex
# ABI config variables are introduced in PEP 425
if
sys
.
version_info
[:
2
]
<
(
3
,
2
):
import
warnings
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录