Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9fbc92aa
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,发现更多精彩内容 >>
提交
9fbc92aa
编写于
3月 16, 2015
作者:
M
Maksim Shabunin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added cmake option for abi descriptor generating (GENERATE_ABI_DESCRIPTOR)
上级
e12a04ac
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
73 addition
and
6 deletion
+73
-6
CMakeLists.txt
CMakeLists.txt
+4
-0
cmake/OpenCVGenABI.cmake
cmake/OpenCVGenABI.cmake
+29
-0
cmake/templates/opencv_abi.xml.in
cmake/templates/opencv_abi.xml.in
+40
-0
include/opencv/cvaux.h
include/opencv/cvaux.h
+0
-6
未找到文件。
CMakeLists.txt
浏览文件 @
9fbc92aa
...
...
@@ -244,6 +244,7 @@ OCV_OPTION(ENABLE_NOISY_WARNINGS "Show all warnings even if they are too no
OCV_OPTION
(
OPENCV_WARNINGS_ARE_ERRORS
"Treat warnings as errors"
OFF
)
OCV_OPTION
(
ANDROID_EXAMPLES_WITH_LIBS
"Build binaries of Android examples with native libraries"
OFF IF ANDROID
)
OCV_OPTION
(
ENABLE_IMPL_COLLECTION
"Collect implementation data on function call"
OFF
)
OCV_OPTION
(
GENERATE_ABI_DESCRIPTOR
"Generate XML file for abi_compliance_checker tool"
OFF IF UNIX
)
if
(
ENABLE_IMPL_COLLECTION
)
add_definitions
(
-DCV_COLLECT_IMPL_DATA
)
...
...
@@ -639,6 +640,9 @@ include(cmake/OpenCVGenConfig.cmake)
# Generate Info.plist for the IOS framework
include
(
cmake/OpenCVGenInfoPlist.cmake
)
# Generate ABI descriptor
include
(
cmake/OpenCVGenABI.cmake
)
# Generate environment setup file
if
(
INSTALL_TESTS AND OPENCV_TEST_DATA_PATH
)
if
(
ANDROID
)
...
...
cmake/OpenCVGenABI.cmake
0 → 100644
浏览文件 @
9fbc92aa
if
(
NOT GENERATE_ABI_DESCRIPTOR
)
return
()
endif
()
set
(
filename
"opencv_abi.xml"
)
set
(
path1
"
${
CMAKE_BINARY_DIR
}
/
${
filename
}
"
)
set
(
modules
"
${
OPENCV_MODULES_PUBLIC
}
"
)
ocv_list_filterout
(
modules
"opencv_ts"
)
message
(
STATUS
"Generating ABI compliance checker configuration:
${
filename
}
"
)
if
(
OPENCV_VCSVERSION AND NOT OPENCV_VCSVERSION STREQUAL
"unknown"
)
set
(
OPENCV_ABI_VERSION
"
${
OPENCV_VCSVERSION
}
"
)
else
()
set
(
OPENCV_ABI_VERSION
"
${
OPENCV_VERSION
}
"
)
endif
()
# Headers
set
(
OPENCV_ABI_HEADERS
"{RELPATH}/
${
OPENCV_INCLUDE_INSTALL_PATH
}
"
)
# Libraries
set
(
OPENCV_ABI_LIBRARIES
"{RELPATH}/
${
OPENCV_LIB_INSTALL_PATH
}
"
)
# Options
set
(
OPENCV_ABI_GCC_OPTIONS
"
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_RELEASE
}
"
)
string
(
REGEX REPLACE
"([^ ]) +([^ ])"
"
\\
1
\\
n
\\
2"
OPENCV_ABI_GCC_OPTIONS
"
${
OPENCV_ABI_GCC_OPTIONS
}
"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/templates/opencv_abi.xml.in"
"
${
path1
}
"
)
cmake/templates/opencv_abi.xml.in
0 → 100644
浏览文件 @
9fbc92aa
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is auto-generated
-->
<descriptor>
<version>
@OPENCV_ABI_VERSION@
</version>
<headers>
@OPENCV_ABI_HEADERS@
</headers>
<libs>
@OPENCV_ABI_LIBRARIES@
</libs>
<skip_headers>
opencv2/core/cuda*
opencv2/core/private*
opencv/cxeigen.hpp
opencv2/core/eigen.hpp
opencv2/flann/hdf5.h
opencv2/imgcodecs/ios.h
opencv2/videoio/cap_ios.h
opencv2/ts.hpp
opencv2/ts/*
opencv2/xobjdetect/private.hpp
</skip_headers>
<gcc_options>
@OPENCV_ABI_GCC_OPTIONS@
</gcc_options>
</descriptor>
include/opencv/cvaux.h
浏览文件 @
9fbc92aa
...
...
@@ -51,12 +51,6 @@
#include "opencv2/photo/photo_c.h"
#include "opencv2/video/tracking_c.h"
#include "opencv2/objdetect/objdetect_c.h"
#include "opencv2/contrib/compat.hpp"
#include "opencv2/legacy.hpp"
#include "opencv2/legacy/compat.hpp"
#include "opencv2/legacy/blobtrack.hpp"
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录