Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
86aabf70
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,发现更多精彩内容 >>
提交
86aabf70
编写于
12月 26, 2013
作者:
R
Roman Donchenko
提交者:
OpenCV Buildbot
12月 26, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2050 from asmorkalov:android_mk_fix2
上级
b94963d3
358e59e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
1 deletion
+12
-1
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVGenAndroidMK.cmake
+7
-0
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCV.mk.in
+5
-1
未找到文件。
cmake/OpenCVGenAndroidMK.cmake
浏览文件 @
86aabf70
...
...
@@ -44,6 +44,7 @@ if(ANDROID)
# build the list of opencv libs and dependencies for all modules
set
(
OPENCV_MODULES_CONFIGMAKE
""
)
set
(
OPENCV_HAVE_GPU_MODULE_CONFIGMAKE
"off"
)
set
(
OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
""
)
set
(
OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE
""
)
foreach
(
m
${
OPENCV_MODULES_PUBLIC
}
)
...
...
@@ -68,6 +69,12 @@ if(ANDROID)
list
(
REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE
${
OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE
}
)
endif
()
# GPU module enabled separately
list
(
REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE
"gpu"
)
if
(
HAVE_opencv_gpu
)
set
(
OPENCV_HAVE_GPU_MODULE_CONFIGMAKE
"on"
)
endif
()
# convert CMake lists to makefile literals
foreach
(
lst OPENCV_MODULES_CONFIGMAKE OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
)
ocv_list_unique
(
${
lst
}
)
...
...
cmake/templates/OpenCV.mk.in
浏览文件 @
86aabf70
...
...
@@ -13,10 +13,11 @@ OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@
OPENCV_HAVE_GPU_MODULE=@OPENCV_HAVE_GPU_MODULE_CONFIGMAKE@
OPENCV_USE_GPU_MODULE:=
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
if
neq ($(findstring gpu,$(OPENCV_MODULES)),
)
if
eq ($(OPENCV_HAVE_GPU_MODULE),on
)
ifneq ($(CUDA_TOOLKIT_DIR),)
OPENCV_USE_GPU_MODULE:=on
endif
...
...
@@ -114,6 +115,9 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
ifneq ($(OPENCV_BASEDIR),)
OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
ifeq ($(OPENCV_USE_GPU_MODULE),on)
OPENCV_LOCAL_C_INCLUDES += $(OPENCV_BASEDIR)/modules/gpu/include
endif
endif
#turn off module installation to prevent their redefinition
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录