Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b31ce408
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b31ce408
编写于
12月 03, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix processing order of <wrapper>_bindings_generator
- ensure that wrapped modules are already processed
上级
e309ad84
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
12 deletion
+11
-12
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+10
-11
modules/python/bindings/CMakeLists.txt
modules/python/bindings/CMakeLists.txt
+1
-1
未找到文件。
cmake/OpenCVModule.cmake
浏览文件 @
b31ce408
...
...
@@ -98,15 +98,6 @@ macro(ocv_add_dependencies full_modname)
endforeach
()
unset
(
__depsvar
)
# hack for python
set
(
__python_idx
)
list
(
FIND OPENCV_MODULE_
${
full_modname
}
_WRAPPERS
"python"
__python_idx
)
if
(
NOT __python_idx EQUAL -1
)
list
(
REMOVE_ITEM OPENCV_MODULE_
${
full_modname
}
_WRAPPERS
"python"
)
list
(
APPEND OPENCV_MODULE_
${
full_modname
}
_WRAPPERS
"python_bindings_generator"
"python2"
"python3"
)
endif
()
unset
(
__python_idx
)
ocv_list_unique
(
OPENCV_MODULE_
${
full_modname
}
_REQ_DEPS
)
ocv_list_unique
(
OPENCV_MODULE_
${
full_modname
}
_OPT_DEPS
)
ocv_list_unique
(
OPENCV_MODULE_
${
full_modname
}
_PRIVATE_REQ_DEPS
)
...
...
@@ -209,9 +200,17 @@ macro(ocv_add_module _name)
set
(
OPENCV_MODULES_DISABLED_USER
${
OPENCV_MODULES_DISABLED_USER
}
"
${
the_module
}
"
CACHE INTERNAL
"List of OpenCV modules explicitly disabled by user"
)
endif
()
# add reverse wrapper dependencies
# add reverse wrapper dependencies
(BINDINDS)
foreach
(
wrapper
${
OPENCV_MODULE_
${
the_module
}
_WRAPPERS
}
)
ocv_add_dependencies
(
opencv_
${
wrapper
}
OPTIONAL
${
the_module
}
)
if
(
wrapper STREQUAL
"python"
)
# hack for python (BINDINDS)
ocv_add_dependencies
(
opencv_python2 OPTIONAL
${
the_module
}
)
ocv_add_dependencies
(
opencv_python3 OPTIONAL
${
the_module
}
)
else
()
ocv_add_dependencies
(
opencv_
${
wrapper
}
OPTIONAL
${
the_module
}
)
endif
()
if
(
DEFINED OPENCV_MODULE_opencv_
${
wrapper
}
_bindings_generator_CLASS
)
ocv_add_dependencies
(
opencv_
${
wrapper
}
_bindings_generator OPTIONAL
${
the_module
}
)
endif
()
endforeach
()
# stop processing of current file
...
...
modules/python/bindings/CMakeLists.txt
浏览文件 @
b31ce408
...
...
@@ -11,7 +11,7 @@ set(PYTHON_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
# get list of modules to wrap
set
(
OPENCV_PYTHON_MODULES
)
foreach
(
m
${
OPENCV_MODULES_BUILD
}
)
if
(
";
${
OPENCV_MODULE_
${
m
}
_WRAPPERS
}
;"
MATCHES
";
${
MODULE_NAME
}
;"
AND HAVE_
${
m
}
)
if
(
";
${
OPENCV_MODULE_
${
m
}
_WRAPPERS
}
;"
MATCHES
";
python
;"
AND HAVE_
${
m
}
)
list
(
APPEND OPENCV_PYTHON_MODULES
${
m
}
)
#message(STATUS "\t${m}")
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录