Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv-python
提交
6b3dae72
O
opencv-python
项目概览
OpenCV
/
opencv-python
12 个月 前同步成功
通知
230
Star
3707
Fork
754
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6b3dae72
编写于
3月 22, 2020
作者:
O
Olli-Pekka Heinisuo
提交者:
GitHub
3月 22, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #293 from dlech/master
Fix Qt on macOS
上级
2fd09dc0
d1a71597
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
0 deletion
+22
-0
.gitignore
.gitignore
+1
-0
cv2/__init__.py
cv2/__init__.py
+7
-0
patches/patchQtPlugins
patches/patchQtPlugins
+12
-0
setup.py
setup.py
+2
-0
未找到文件。
.gitignore
浏览文件 @
6b3dae72
...
...
@@ -67,3 +67,4 @@ target/
# Build temporary files
/contrib.enabled
/cv_version.py
_skbuild/
cv2/__init__.py
浏览文件 @
6b3dae72
import
importlib
import
os
import
sys
from
.cv2
import
*
from
.data
import
*
...
...
@@ -6,3 +8,8 @@ from .data import *
# wildcard import above does not import "private" variables like __version__
# this makes them available
globals
().
update
(
importlib
.
import_module
(
'cv2.cv2'
).
__dict__
)
if
sys
.
platform
==
'darwin'
:
os
.
environ
[
'QT_QPA_PLATFORM_PLUGIN_PATH'
]
=
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
)),
'qt'
,
'plugins'
)
patches/patchQtPlugins
0 → 100644
浏览文件 @
6b3dae72
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 8ccad4d03a..0d5e2a79e9 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1164,6 +1164,7 @@
if(WITH_QT OR HAVE_QT)
if(HAVE_QT5)
status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
elseif(HAVE_QT)
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
setup.py
浏览文件 @
6b3dae72
...
...
@@ -128,6 +128,7 @@ def main():
if
sys
.
platform
==
'darwin'
and
not
build_headless
:
cmake_args
.
append
(
"-DWITH_QT=5"
)
rearrange_cmake_output_data
[
'cv2.qt.plugins.platforms'
]
=
[(
r
'lib/qt/plugins/platforms/libqcocoa\.dylib'
)]
if
build_headless
:
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
...
...
@@ -144,6 +145,7 @@ def main():
# https://github.com/skvark/opencv-python/issues/21
cmake_args
.
append
(
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
)
cmake_args
.
append
(
"-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9"
)
subprocess
.
check_call
(
"patch -p1 < patches/patchQtPlugins"
,
shell
=
True
)
if
sys
.
platform
.
startswith
(
'linux'
):
cmake_args
.
append
(
"-DWITH_IPP=OFF"
)
# tests fail with IPP compiled with
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录