Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
edce617a
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,发现更多精彩内容 >>
提交
edce617a
编写于
12月 23, 2013
作者:
R
Roman Donchenko
提交者:
OpenCV Buildbot
12月 23, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2040 from asmorkalov:android_mk_fix
上级
83cdd43a
51d3138d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
1 deletion
+34
-1
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVGenAndroidMK.cmake
+5
-0
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCV.mk.in
+28
-0
modules/dynamicuda/CMakeLists.txt
modules/dynamicuda/CMakeLists.txt
+1
-1
未找到文件。
cmake/OpenCVGenAndroidMK.cmake
浏览文件 @
edce617a
...
@@ -53,6 +53,11 @@ if(ANDROID)
...
@@ -53,6 +53,11 @@ if(ANDROID)
endif
()
endif
()
endforeach
()
endforeach
()
# remove CUDA runtime and NPP from regular deps
# it can be added seporately if needed.
ocv_list_filterout
(
OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
"libcu"
)
ocv_list_filterout
(
OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
"libnpp"
)
# split 3rdparty libs and modules
# split 3rdparty libs and modules
foreach
(
mod
${
OPENCV_MODULES_CONFIGMAKE
}
)
foreach
(
mod
${
OPENCV_MODULES_CONFIGMAKE
}
)
if
(
NOT mod MATCHES
"^opencv_.+$"
)
if
(
NOT mod MATCHES
"^opencv_.+$"
)
...
...
cmake/templates/OpenCV.mk.in
浏览文件 @
edce617a
...
@@ -13,6 +13,18 @@ OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
...
@@ -13,6 +13,18 @@ OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@
OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@
OPENCV_USE_GPU_MODULE:=
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifneq ($(findstring gpu,$(OPENCV_MODULES)),)
ifneq ($(CUDA_TOOLKIT_DIR),)
OPENCV_USE_GPU_MODULE:=on
endif
endif
endif
CUDA_RUNTIME_LIBS:=cufft npps nppi nppc cudart
ifeq ($(OPENCV_LIB_TYPE),)
ifeq ($(OPENCV_LIB_TYPE),)
OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@
OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@
endif
endif
...
@@ -108,6 +120,13 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
...
@@ -108,6 +120,13 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
endif
endif
ifeq ($(OPENCV_USE_GPU_MODULE),on)
include $(CLEAR_VARS)
LOCAL_MODULE:=opencv_gpu
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
include $(PREBUILT_STATIC_LIBRARY)
endif
ifeq ($(OPENCV_LOCAL_CFLAGS),)
ifeq ($(OPENCV_LOCAL_CFLAGS),)
OPENCV_LOCAL_CFLAGS := -fPIC -DANDROID -fsigned-char
OPENCV_LOCAL_CFLAGS := -fPIC -DANDROID -fsigned-char
endif
endif
...
@@ -116,6 +135,10 @@ include $(CLEAR_VARS)
...
@@ -116,6 +135,10 @@ include $(CLEAR_VARS)
LOCAL_C_INCLUDES += $(OPENCV_LOCAL_C_INCLUDES)
LOCAL_C_INCLUDES += $(OPENCV_LOCAL_C_INCLUDES)
LOCAL_CFLAGS += $(OPENCV_LOCAL_CFLAGS)
LOCAL_CFLAGS += $(OPENCV_LOCAL_CFLAGS)
ifeq ($(OPENCV_USE_GPU_MODULE),on)
LOCAL_C_INCLUDES += $(CUDA_TOOLKIT_DIR)/include
endif
ifeq ($(OPENCV_INSTALL_MODULES),on)
ifeq ($(OPENCV_INSTALL_MODULES),on)
LOCAL_$(OPENCV_LIB_TYPE)_LIBRARIES += $(foreach mod, $(OPENCV_LIBS), opencv_$(mod))
LOCAL_$(OPENCV_LIB_TYPE)_LIBRARIES += $(foreach mod, $(OPENCV_LIBS), opencv_$(mod))
else
else
...
@@ -128,5 +151,10 @@ endif
...
@@ -128,5 +151,10 @@ endif
LOCAL_LDLIBS += $(foreach lib,$(OPENCV_EXTRA_COMPONENTS), -l$(lib))
LOCAL_LDLIBS += $(foreach lib,$(OPENCV_EXTRA_COMPONENTS), -l$(lib))
ifeq ($(OPENCV_USE_GPU_MODULE),on)
LOCAL_STATIC_LIBRARIES+=libopencv_gpu
LOCAL_LDLIBS += -L$(CUDA_TOOLKIT_DIR)/lib $(foreach lib, $(CUDA_RUNTIME_LIBS), -l$(lib))
endif
#restore the LOCAL_PATH
#restore the LOCAL_PATH
LOCAL_PATH:=$(USER_LOCAL_PATH)
LOCAL_PATH:=$(USER_LOCAL_PATH)
modules/dynamicuda/CMakeLists.txt
浏览文件 @
edce617a
if
(
NOT
DYNAMIC_CUDA_SUPPORT
)
if
(
NOT
ENABLE_DYNAMIC_CUDA
)
ocv_module_disable
(
dynamicuda
)
ocv_module_disable
(
dynamicuda
)
endif
()
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录