Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6d00182e
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,发现更多精彩内容 >>
提交
6d00182e
编写于
4月 16, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed Android build with correct manifest file
上级
570c8254
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
6 deletion
+7
-6
modules/java/CMakeLists.txt
modules/java/CMakeLists.txt
+7
-6
未找到文件。
modules/java/CMakeLists.txt
浏览文件 @
6d00182e
...
...
@@ -183,6 +183,7 @@ if(ANDROID)
# manifest, jni, Eclipse project
file
(
GLOB_RECURSE android_lib_project_files RELATIVE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android/"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android/*"
)
list
(
REMOVE_ITEM android_lib_project_files
"
${
ANDROID_MANIFEST_FILE
}
"
)
foreach
(
f
${
android_lib_project_files
}
)
if
(
NOT f MATCHES
"
\\
.svn"
)
add_custom_command
(
...
...
@@ -222,10 +223,12 @@ if(ANDROID)
android_get_compatible_target
(
lib_target_sdk_target
${
ANDROID_NATIVE_API_LEVEL
}
${
ANDROID_SDK_TARGET
}
)
add_custom_command
(
OUTPUT
${
lib_target_files
}
OUTPUT
${
lib_target_files
}
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
COMMAND
${
CMAKE_COMMAND
}
-E remove
${
lib_target_files
}
COMMAND
${
ANDROID_EXECUTABLE
}
--silent update lib-project --path \"
${
OpenCV_BINARY_DIR
}
\" --target \"
${
lib_target_sdk_target
}
\"
MAIN_DEPENDENCY
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
COMMAND
${
CMAKE_COMMAND
}
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android/
${
ANDROID_MANIFEST_FILE
}
"
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
COMMAND
${
ANDROID_EXECUTABLE
}
--silent create lib-project --path \"
${
OpenCV_BINARY_DIR
}
\" --target \"
${
lib_target_sdk_target
}
\" --name OpenCV --package org.opencv 2>\"
${
CMAKE_CURRENT_BINARY_DIR
}
/create_lib_project.log\"
COMMAND
${
CMAKE_COMMAND
}
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android/
${
ANDROID_MANIFEST_FILE
}
"
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
MAIN_DEPENDENCY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android/
${
ANDROID_MANIFEST_FILE
}
"
DEPENDS
${
lib_proj_files
}
COMMENT
"Generating OpenCV Android library project. SDK target:
${
lib_target_sdk_target
}
"
)
...
...
@@ -247,9 +250,7 @@ if(ANDROID)
list
(
APPEND lib_target_files
"
${
OpenCV_BINARY_DIR
}
/bin/classes.jar"
)
endif
()
add_custom_target
(
${
lib_target
}
SOURCES
${
lib_proj_files
}
${
lib_target_files
}
)
add_custom_target
(
${
lib_target
}
SOURCES
${
lib_proj_files
}
${
lib_target_files
}
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
)
add_dependencies
(
${
lib_target
}
${
api_target
}
)
add_dependencies
(
${
the_module
}
${
lib_target
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录