Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
86ec9b79
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,发现更多精彩内容 >>
提交
86ec9b79
编写于
5月 14, 2013
作者:
D
Dominik Rose
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libd1394 2.x support for mingw on windows added
上级
2a646f76
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
63 addition
and
7 deletion
+63
-7
CMakeLists.txt
CMakeLists.txt
+14
-1
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVFindLibsVideo.cmake
+32
-5
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+7
-0
modules/highgui/src/cap_dc1394_v2.cpp
modules/highgui/src/cap_dc1394_v2.cpp
+10
-1
未找到文件。
CMakeLists.txt
浏览文件 @
86ec9b79
...
@@ -103,6 +103,19 @@ if(UNIX AND NOT ANDROID)
...
@@ -103,6 +103,19 @@ if(UNIX AND NOT ANDROID)
endif
()
endif
()
endif
()
endif
()
# Add these standard paths to the search paths for FIND_PATH
# to find include files from these locations first
if
(
MINGW
)
if
(
EXISTS /mingw
)
list
(
APPEND CMAKE_LIBRARY_PATH /mingw
)
endif
()
if
(
EXISTS /mingw32
)
list
(
APPEND CMAKE_LIBRARY_PATH /mingw32
)
endif
()
if
(
EXISTS /mingw64
)
list
(
APPEND CMAKE_LIBRARY_PATH /mingw64
)
endif
()
endif
()
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# OpenCV cmake options
# OpenCV cmake options
...
@@ -110,7 +123,7 @@ endif()
...
@@ -110,7 +123,7 @@ endif()
# Optional 3rd party components
# Optional 3rd party components
# ===================================================
# ===================================================
OCV_OPTION
(
WITH_1394
"Include IEEE1394 support"
ON
IF
(
UNIX AND
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_1394
"Include IEEE1394 support"
ON
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_AVFOUNDATION
"Use AVFoundation for Video I/O"
ON IF IOS
)
OCV_OPTION
(
WITH_AVFOUNDATION
"Use AVFoundation for Video I/O"
ON IF IOS
)
OCV_OPTION
(
WITH_CARBON
"Use Carbon for UI instead of Cocoa"
OFF IF APPLE
)
OCV_OPTION
(
WITH_CARBON
"Use Carbon for UI instead of Cocoa"
OFF IF APPLE
)
OCV_OPTION
(
WITH_CUDA
"Include NVidia Cuda Runtime support"
ON
IF
(
CMAKE_VERSION VERSION_GREATER
"2.8"
AND NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_CUDA
"Include NVidia Cuda Runtime support"
ON
IF
(
CMAKE_VERSION VERSION_GREATER
"2.8"
AND NOT ANDROID AND NOT IOS
)
)
...
...
cmake/OpenCVFindLibsVideo.cmake
浏览文件 @
86ec9b79
...
@@ -81,10 +81,37 @@ endif(WITH_GIGEAPI)
...
@@ -81,10 +81,37 @@ endif(WITH_GIGEAPI)
# --- Dc1394 ---
# --- Dc1394 ---
ocv_clear_vars
(
HAVE_DC1394 HAVE_DC1394_2
)
ocv_clear_vars
(
HAVE_DC1394 HAVE_DC1394_2
)
if
(
WITH_1394
)
if
(
WITH_1394
)
if
(
WIN32
)
if
(
MINGW
)
find_path
(
CMU1394_INCLUDE_PATH
"/1394common.h"
PATH_SUFFIXES include
DOC
"The path to cmu1394 headers"
)
find_path
(
DC1394_2_INCLUDE_PATH
"/dc1394/dc1394.h"
PATH_SUFFIXES include
DOC
"The path to DC1394 2.x headers"
)
if
(
CMU1394_INCLUDE_PATH AND DC1394_2_INCLUDE_PATH
)
set
(
CMU1394_LIB_DIR
"
${
CMU1394_INCLUDE_PATH
}
/../lib"
CACHE PATH
"Full path of CMU1394 library directory"
)
set
(
DC1394_2_LIB_DIR
"
${
DC1394_2_INCLUDE_PATH
}
/../lib"
CACHE PATH
"Full path of DC1394 2.x library directory"
)
if
(
EXISTS
"
${
CMU1394_LIB_DIR
}
/lib1394camera.a"
AND EXISTS
"
${
DC1394_2_LIB_DIR
}
/libdc1394.a"
)
set
(
HAVE_DC1394_2 TRUE
)
endif
()
endif
()
if
(
HAVE_DC1394_2
)
ocv_parse_pkg
(
"libdc1394-2"
"
${
DC1394_2_LIB_DIR
}
/pkgconfig"
""
)
ocv_include_directories
(
${
DC1394_2_INCLUDE_PATH
}
)
set
(
HIGHGUI_LIBRARIES
${
HIGHGUI_LIBRARIES
}
"
${
DC1394_2_LIB_DIR
}
/libdc1394.a"
"
${
CMU1394_LIB_DIR
}
/lib1394camera.a"
)
endif
(
HAVE_DC1394_2
)
else
(
MINGW
)
message
(
STATUS
"libdc1394 compilation is disabled (due to only MinGW compiler supported on your platform)."
)
endif
(
MINGW
)
else
(
WIN32
)
CHECK_MODULE
(
libdc1394-2 HAVE_DC1394_2
)
CHECK_MODULE
(
libdc1394-2 HAVE_DC1394_2
)
if
(
NOT HAVE_DC1394_2
)
if
(
NOT HAVE_DC1394_2
)
CHECK_MODULE
(
libdc1394 HAVE_DC1394
)
CHECK_MODULE
(
libdc1394 HAVE_DC1394
)
endif
()
endif
()
endif
(
WIN32
)
endif
(
WITH_1394
)
endif
(
WITH_1394
)
# --- xine ---
# --- xine ---
...
@@ -197,7 +224,7 @@ endif(WITH_MSMF)
...
@@ -197,7 +224,7 @@ endif(WITH_MSMF)
# --- Extra HighGUI libs on Windows ---
# --- Extra HighGUI libs on Windows ---
if
(
WIN32
)
if
(
WIN32
)
list
(
APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32 vfw32
)
list
(
APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32
setupapi ws2_32
vfw32
)
if
(
MINGW64
)
if
(
MINGW64
)
list
(
APPEND HIGHGUI_LIBRARIES avifil32 avicap32 winmm msvfw32
)
list
(
APPEND HIGHGUI_LIBRARIES avifil32 avicap32 winmm msvfw32
)
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES vfw32
)
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES vfw32
)
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
86ec9b79
...
@@ -511,6 +511,13 @@ macro(ocv_parse_header2 LIBNAME HDR_PATH VARNAME)
...
@@ -511,6 +511,13 @@ macro(ocv_parse_header2 LIBNAME HDR_PATH VARNAME)
endif
()
endif
()
endmacro
()
endmacro
()
# read single version info from the pkg file
macro
(
ocv_parse_pkg LIBNAME PKG_PATH SCOPE
)
if
(
EXISTS
"
${
PKG_PATH
}
/
${
LIBNAME
}
.pc"
)
file
(
STRINGS
"
${
PKG_PATH
}
/
${
LIBNAME
}
.pc"
line_to_parse REGEX
"^Version:[
\t
]+[0-9.]*.*$"
LIMIT_COUNT 1
)
STRING
(
REGEX REPLACE
".*Version: ([^ ]+).*"
"
\\
1"
ALIASOF_
${
LIBNAME
}
_VERSION
"
${
line_to_parse
}
"
)
endif
()
endmacro
()
################################################################################################
################################################################################################
# short command to setup source group
# short command to setup source group
...
...
modules/highgui/src/cap_dc1394_v2.cpp
浏览文件 @
86ec9b79
...
@@ -45,7 +45,16 @@
...
@@ -45,7 +45,16 @@
#include <unistd.h>
#include <unistd.h>
#include <stdint.h>
#include <stdint.h>
#include <sys/select.h>
#ifdef WIN32
// On Windows, we have no sys/select.h, but we need to pick up
// select() which is in winsock2.
#ifndef __SYS_SELECT_H__
#define __SYS_SELECT_H__ 1
#include <winsock2.h>
#endif
#else
#include <sys/select.h>
#endif
/*WIN32*/
#include <dc1394/dc1394.h>
#include <dc1394/dc1394.h>
#include <stdlib.h>
#include <stdlib.h>
#include <string.h>
#include <string.h>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录