Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
355f6d0a
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,发现更多精彩内容 >>
提交
355f6d0a
编写于
7月 13, 2011
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed Android SDK searching
上级
53526846
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
20 deletion
+40
-20
CMakeLists.txt
CMakeLists.txt
+40
-20
未找到文件。
CMakeLists.txt
浏览文件 @
355f6d0a
...
...
@@ -725,42 +725,62 @@ if (BUILD_JAVA_SUPPORT)
"/opt/android-sdk-mac_86/tools/"
)
if
(
ANDROID_EXECUTABLE
)
message
(
STATUS
" Found android tool:
${
ANDROID_EXECUTABLE
}
"
)
get_filename_component
(
ANDROID_SDK_TOOLS_PATH
"
${
ANDROID_EXECUTABLE
}
"
PATH
)
#read source.properties
file
(
STRINGS
"
${
ANDROID_SDK_TOOLS_PATH
}
/source.properties"
ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES REGEX
"^[ ]*[^#].*$"
)
foreach
(
line
${
ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES
}
)
string
(
REPLACE
"
\\
:"
":"
line
${
line
}
)
string
(
REPLACE
"="
";"
line
${
line
}
)
list
(
GET line 0 line_name
)
list
(
GET line 1 line_value
)
string
(
REPLACE
"."
"_"
line_name
${
line_name
}
)
SET
(
ANDROID_TOOLS_
${
line_name
}
"
${
line_value
}
"
)
MARK_AS_ADVANCED
(
ANDROID_TOOLS_
${
line_name
}
)
endforeach
()
if
(
EXISTS
"
${
ANDROID_SDK_TOOLS_PATH
}
/source.properties"
)
file
(
STRINGS
"
${
ANDROID_SDK_TOOLS_PATH
}
/source.properties"
ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES REGEX
"^[ ]*[^#].*$"
)
foreach
(
line
${
ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES
}
)
string
(
REPLACE
"
\\
:"
":"
line
${
line
}
)
string
(
REPLACE
"="
";"
line
${
line
}
)
list
(
GET line 0 line_name
)
list
(
GET line 1 line_value
)
string
(
REPLACE
"."
"_"
line_name
${
line_name
}
)
SET
(
ANDROID_TOOLS_
${
line_name
}
"
${
line_value
}
"
)
MARK_AS_ADVANCED
(
ANDROID_TOOLS_
${
line_name
}
)
endforeach
()
else
()
SET
(
ANDROID_TOOLS_Pkg_Desc
"Android SDK Tools revision is less then 12. Please update your Android SDK."
)
MARK_AS_ADVANCED
(
ANDROID_TOOLS_Pkg_Desc
)
endif
()
#get installed targets
execute_process
(
COMMAND
${
ANDROID_EXECUTABLE
}
list target -c
RESULT_VARIABLE ANDROID_PROCESS
OUTPUT_VARIABLE ANDROID_SDK_TARGETS
ERROR_VARIABLE ANDROID_PROCESS_ERRORS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REPLACE
"
\n
"
";"
ANDROID_SDK_TARGETS
${
ANDROID_SDK_TARGETS
}
)
# detect ANDROID_SDK_TARGET if no target is provided by user
if
(
NOT ANDROID_SDK_TARGET
)
foreach
(
target
${
ANDROID_SDK_TARGETS
}
)
string
(
REGEX MATCH
"[0-9]+$"
target_level
"
${
target
}
"
)
if
(
target_level GREATER 7
)
set
(
ANDROID_SDK_TARGET
"
${
target
}
"
)
break
()
if
(
NOT ANDROID_PROCESS EQUAL 0
)
set
(
ANDROID_SDK_TARGET android-8
)
message
(
STATUS
"Could not retrieve list of installed Android targets. Will use default
\"
${
ANDROID_SDK_TARGET
}
\"
target"
)
else
()
set
(
desired_android_target_level
${
ANDROID_API_LEVEL
}
)
if
(
desired_android_target_level LESS 8
)
set
(
desired_android_target_level 8
)
endif
()
endforeach
()
math
(
EXPR desired_android_target_level
"
${
desired_android_target_level
}
-1"
)
foreach
(
target
${
ANDROID_SDK_TARGETS
}
)
string
(
REGEX MATCH
"[0-9]+$"
target_level
"
${
target
}
"
)
if
(
target_level GREATER desired_android_target_level
)
set
(
ANDROID_SDK_TARGET
"
${
target
}
"
)
break
()
endif
()
endforeach
()
endif
()
endif
()
SET
(
ANDROID_SDK_TARGET
${
ANDROID_SDK_TARGET
}
CACHE STRING
"SDK target for Android tests and samples"
)
set_property
(
CACHE ANDROID_SDK_TARGET PROPERTY STRINGS
${
ANDROID_SDK_TARGETS
}
)
if
(
ANDROID_PROCESS EQUAL 0
)
set_property
(
CACHE ANDROID_SDK_TARGET PROPERTY STRINGS
${
ANDROID_SDK_TARGETS
}
)
endif
()
string
(
REGEX MATCH
"[0-9]+$"
ANDROID_SDK_TARGET_LEVEL
"
${
ANDROID_SDK_TARGET
}
"
)
message
(
STATUS
" Found android tool:
${
ANDROID_EXECUTABLE
}
"
)
endif
()
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录