Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2c30f358
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
2c30f358
编写于
6月 21, 2017
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8947 from alalek:vs_version
上级
6f3d881d
a9cc8763
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
122 addition
and
5 deletion
+122
-5
.gitattributes
.gitattributes
+2
-0
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+25
-1
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+46
-0
cmake/OpenCVVersion.cmake
cmake/OpenCVVersion.cmake
+7
-0
cmake/templates/vs_version.rc.in
cmake/templates/vs_version.rc.in
+38
-0
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+1
-1
modules/imgcodecs/CMakeLists.txt
modules/imgcodecs/CMakeLists.txt
+1
-1
modules/shape/CMakeLists.txt
modules/shape/CMakeLists.txt
+1
-1
modules/world/CMakeLists.txt
modules/world/CMakeLists.txt
+1
-1
未找到文件。
.gitattributes
浏览文件 @
2c30f358
...
...
@@ -31,6 +31,8 @@
*.py text
*.qrc text
*.qss text
*.rc text
*.rc.in text
*.S text
*.sbt text
*.scala text
...
...
cmake/OpenCVModule.cmake
浏览文件 @
2c30f358
...
...
@@ -800,11 +800,35 @@ macro(_ocv_create_module)
endforeach
()
endif
()
if
(
WIN32 AND BUILD_SHARED_LIBS AND NOT OPENCV_VS_VERSIONINFO_SKIP
)
if
(
DEFINED OPENCV_VS_VERSIONINFO_FILE
)
set
(
_VS_VERSION_FILE
"
${
OPENCV_VS_VERSIONINFO_FILE
}
"
)
elseif
(
DEFINED OPENCV_VS_VERSIONINFO_
${
the_module
}
_FILE
)
set
(
_VS_VERSION_FILE
"
${
OPENCV_VS_VERSIONINFO_
${
the_module
}
_FILE")
elseif(NOT OPENCV_VS_VERSIONINFO_SKIP_GENERATION)
set(_VS_VERSION_FILE "
${
CMAKE_CURRENT_BINARY_DIR
}
/vs_version.rc")
ocv_generate_vs_version_file("
${
_VS_VERSION_FILE
}
"
NAME "
${
the_module
}
"
FILEDESCRIPTION "OpenCV module:
${
OPENCV_MODULE_
${
the_module
}
_DESCRIPTION
}
"
INTERNALNAME "
${
the_module
}${
OPENCV_DLLVERSION
}
"
ORIGINALFILENAME "
${
the_module
}${
OPENCV_DLLVERSION
}
.dll"
)
endif()
if(_VS_VERSION_FILE)
if(NOT EXISTS "
${
_VS_VERSION_FILE
}
")
message(STATUS "
${
the_module
}
: Required .rc file is missing:
${
_VS_VERSION_FILE
}
")
endif()
source_group("Src" FILES "
${
_VS_VERSION_FILE
}
")
endif()
endif()
source_group("Include" FILES "
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/cvconfig.h" "
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/opencv2/opencv_modules.hpp")
source_group("Src" FILES "
${${
the_module
}
_pch
}
")
ocv_add_library(
${
the_module
}
${
OPENCV_MODULE_TYPE
}
${
OPENCV_MODULE_
${
the_module
}
_HEADERS
}
${
OPENCV_MODULE_
${
the_module
}
_SOURCES
}
"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/cvconfig.h" "
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/opencv2/opencv_modules.hpp"
${${
the_module
}
_pch
}
${
sub_objs
}
)
${${
the_module
}
_pch
}
${
sub_objs
}
${
_VS_VERSION_FILE
}
)
if (cuda_objs)
target_link_libraries(
${
the_module
}
${
cuda_objs
}
)
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
2c30f358
...
...
@@ -1128,3 +1128,49 @@ macro(ocv_add_testdata basedir dest_subdir)
endif
()
endif
()
endmacro
()
macro
(
ocv_generate_vs_version_file DESTINATION
)
cmake_parse_arguments
(
VS_VER
""
"NAME;FILEDESCRIPTION;FILEVERSION;INTERNALNAME;COPYRIGHT;ORIGINALFILENAME;PRODUCTNAME;PRODUCTVERSION;COMMENTS;FILEVERSION_QUAD;PRODUCTVERSION_QUAD"
""
${
ARGN
}
)
macro
(
__vs_ver_update_variable name
)
if
(
VS_VER_NAME AND DEFINED OPENCV_
${
VS_VER_NAME
}
_VS_VER_
${
name
}
)
set
(
OPENCV_VS_VER_
${
name
}
"
${
OPENCV_
${
VS_VER_NAME
}
_VS_VER_
${
name
}}
"
)
elseif
(
VS_VER_
${
name
}
)
set
(
OPENCV_VS_VER_
${
name
}
"
${
VS_VER_
${
name
}}
"
)
endif
()
endmacro
()
__vs_ver_update_variable
(
FILEVERSION_QUAD
)
__vs_ver_update_variable
(
PRODUCTVERSION_QUAD
)
macro
(
__vs_ver_update_str_variable name
)
if
(
VS_VER_NAME AND DEFINED OPENCV_
${
VS_VER_NAME
}
_VS_VER_
${
name
}
)
set
(
OPENCV_VS_VER_
${
name
}
_STR
"
${
OPENCV_
${
VS_VER_NAME
}
_VS_VER_
${
name
}}
"
)
elseif
(
VS_VER_
${
name
}
)
set
(
OPENCV_VS_VER_
${
name
}
_STR
"
${
VS_VER_
${
name
}}
"
)
endif
()
endmacro
()
__vs_ver_update_str_variable
(
FILEDESCRIPTION
)
__vs_ver_update_str_variable
(
FILEVERSION
)
__vs_ver_update_str_variable
(
INTERNALNAME
)
__vs_ver_update_str_variable
(
COPYRIGHT
)
__vs_ver_update_str_variable
(
ORIGINALFILENAME
)
__vs_ver_update_str_variable
(
PRODUCTNAME
)
__vs_ver_update_str_variable
(
PRODUCTVERSION
)
__vs_ver_update_str_variable
(
COMMENTS
)
if
(
OPENCV_VS_VER_COPYRIGHT_STR
)
set
(
OPENCV_VS_VER_HAVE_COPYRIGHT_STR 1
)
else
()
set
(
OPENCV_VS_VER_HAVE_COPYRIGHT_STR 0
)
endif
()
if
(
OPENCV_VS_VER_COMMENTS_STR
)
set
(
OPENCV_VS_VER_HAVE_COMMENTS_STR 1
)
else
()
set
(
OPENCV_VS_VER_HAVE_COMMENTS_STR 0
)
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/vs_version.rc.in"
"
${
DESTINATION
}
"
@ONLY
)
endmacro
()
cmake/OpenCVVersion.cmake
浏览文件 @
2c30f358
...
...
@@ -16,3 +16,10 @@ set(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_
# create a dependency on version file
# we never use output of the following command but cmake will rerun automatically if the version file changes
configure_file
(
"
${
OPENCV_VERSION_FILE
}
"
"
${
CMAKE_BINARY_DIR
}
/junk/version.junk"
COPYONLY
)
ocv_update
(
OPENCV_VS_VER_FILEVERSION_QUAD
"
${
OPENCV_VERSION_MAJOR
}
,
${
OPENCV_VERSION_MINOR
}
,
${
OPENCV_VERSION_PATCH
}
,0"
)
ocv_update
(
OPENCV_VS_VER_PRODUCTVERSION_QUAD
"
${
OPENCV_VERSION_MAJOR
}
,
${
OPENCV_VERSION_MINOR
}
,
${
OPENCV_VERSION_PATCH
}
,0"
)
ocv_update
(
OPENCV_VS_VER_FILEVERSION_STR
"
${
OPENCV_VERSION
}
"
)
ocv_update
(
OPENCV_VS_VER_PRODUCTVERSION_STR
"
${
OPENCV_VERSION
}
"
)
ocv_update
(
OPENCV_VS_VER_PRODUCTNAME_STR
"OpenCV library"
)
ocv_update
(
OPENCV_VS_VER_COMMENTS_STR
"http://opencv.org/"
)
cmake/templates/vs_version.rc.in
0 → 100644
浏览文件 @
2c30f358
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENCV_VS_VER_FILEVERSION_QUAD@
PRODUCTVERSION @OPENCV_VS_VER_PRODUCTVERSION_QUAD@
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
#else
FILEFLAGS 0
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "@OPENCV_VS_VER_FILEDESCRIPTION_STR@\0"
VALUE "FileVersion", "@OPENCV_VS_VER_FILEVERSION_STR@\0"
VALUE "InternalName", "@OPENCV_VS_VER_INTERNALNAME_STR@\0"
#if @OPENCV_VS_VER_HAVE_COPYRIGHT_STR@
VALUE "LegalCopyright", "@OPENCV_VS_VER_COPYRIGHT_STR@\0"
#endif
VALUE "OriginalFilename", "@OPENCV_VS_VER_ORIGINALFILENAME_STR@\0"
VALUE "ProductName", "@OPENCV_VS_VER_PRODUCTNAME_STR@\0"
VALUE "ProductVersion", "@OPENCV_VS_VER_PRODUCTVERSION_STR@\0"
#if @OPENCV_VS_VER_HAVE_COMMENTS_STR@
VALUE "Comments", "@OPENCV_VS_VER_COMMENTS_STR@\0"
#endif
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1252
END
END
modules/highgui/CMakeLists.txt
浏览文件 @
2c30f358
set
(
the_description
"High-level GUI
and Media I/O
"
)
set
(
the_description
"High-level GUI"
)
ocv_add_module
(
highgui opencv_imgproc opencv_imgcodecs OPTIONAL opencv_videoio WRAP python
)
# ----------------------------------------------------------------------------
...
...
modules/imgcodecs/CMakeLists.txt
浏览文件 @
2c30f358
set
(
the_description
"Image
codecs
"
)
set
(
the_description
"Image
I/O
"
)
ocv_add_module
(
imgcodecs opencv_imgproc WRAP java python
)
# ----------------------------------------------------------------------------
...
...
modules/shape/CMakeLists.txt
浏览文件 @
2c30f358
set
(
the_description
"Shape descriptors and matchers
.
"
)
set
(
the_description
"Shape descriptors and matchers"
)
ocv_define_module
(
shape opencv_core opencv_imgproc opencv_video WRAP python
)
modules/world/CMakeLists.txt
浏览文件 @
2c30f358
set
(
the_description
"All
the selected OpenCV modules in a single binary
"
)
set
(
the_description
"All
OpenCV modules
"
)
set
(
OPENCV_MODULE_IS_PART_OF_WORLD FALSE
)
set
(
BUILD_opencv_world_INIT OFF
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录