Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
aa871ca5
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
aa871ca5
编写于
7月 10, 2015
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix wrong usage of status(), remove useless message in videoio
上级
6116a2fc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
11 deletion
+10
-11
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+3
-3
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+6
-6
modules/videoio/CMakeLists.txt
modules/videoio/CMakeLists.txt
+1
-2
未找到文件。
cmake/OpenCVModule.cmake
浏览文件 @
aa871ca5
...
...
@@ -720,15 +720,15 @@ macro(_ocv_create_module)
set
(
sub_links
""
)
set
(
cuda_objs
""
)
if
(
OPENCV_MODULE_
${
the_module
}
_CHILDREN
)
status
(
"Complex module
${
the_module
}
"
)
message
(
STATUS
"Complex module
${
the_module
}
"
)
foreach
(
m
${
OPENCV_MODULE_
${
the_module
}
_CHILDREN
}
)
if
(
BUILD_
${
m
}
AND TARGET
${
m
}
_object
)
get_target_property
(
_sub_links
${
m
}
LINK_LIBRARIES
)
list
(
APPEND sub_objs $<TARGET_OBJECTS:
${
m
}
_object>
)
list
(
APPEND sub_links
${
_sub_links
}
)
status
(
" +
${
m
}
"
)
message
(
STATUS
" +
${
m
}
"
)
else
()
status
(
" -
${
m
}
"
)
message
(
STATUS
" -
${
m
}
"
)
endif
()
list
(
APPEND cuda_objs
${
OPENCV_MODULE_
${
m
}
_CUDA_OBJECTS
}
)
endforeach
()
...
...
modules/highgui/CMakeLists.txt
浏览文件 @
aa871ca5
...
...
@@ -76,7 +76,7 @@ elseif(WINRT)
# Enabling it for WiRT 8.1+ only.
# WinRT 8.1+ detected. Adding WinRT API header.
status
(
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
message
(
STATUS
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
list
(
APPEND highgui_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/highgui_winrt.hpp"
)
...
...
@@ -92,16 +92,16 @@ elseif(WINRT)
if
(
WINRT_PHONE
OR
(
OpenCV_ARCH STREQUAL
"ARM"
))
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES
"comctl32"
"gdi32"
"ole32"
"setupapi"
)
if
(
WINRT_PHONE
)
status
(
"
${
name
}
: Windows Phone detected"
)
message
(
STATUS
"
${
name
}
: Windows Phone detected"
)
elseif
(
OpenCV_ARCH STREQUAL
"ARM"
)
status
(
"
${
name
}
: ARM detected"
)
message
(
STATUS
"
${
name
}
: ARM detected"
)
if
(
WINRT_STORE
)
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES
"ws2_32"
)
status
(
"
${
name
}
: Removing 'ws2_32.lib'"
)
message
(
STATUS
"
${
name
}
: Removing 'ws2_32.lib'"
)
endif
()
endif
()
status
(
"
${
name
}
: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'"
)
status
(
"
${
name
}
: Leaving '
${
HIGHGUI_LIBRARIES
}
'"
)
message
(
STATUS
"
${
name
}
: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'"
)
message
(
STATUS
"
${
name
}
: Leaving '
${
HIGHGUI_LIBRARIES
}
'"
)
endif
()
elseif
(
HAVE_WIN32UI
)
list
(
APPEND highgui_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/window_w32.cpp
)
...
...
modules/videoio/CMakeLists.txt
浏览文件 @
aa871ca5
...
...
@@ -33,7 +33,6 @@ file(GLOB videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.h"
)
# Removing WinRT API headers by default
status
(
"
${
name
}
: Removing WinRT API headers by default"
)
list
(
REMOVE_ITEM videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/cap_winrt.hpp"
)
# Dependencies used by the implementation referenced
...
...
@@ -42,7 +41,7 @@ list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${n
if
(
DEFINED WINRT AND NOT DEFINED WINRT_8_0
)
# WinRT detected. Adding WinRT API header
status
(
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
message
(
STATUS
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
list
(
APPEND videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/cap_winrt.hpp"
)
# Adding WinRT internal sources and headers
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录