Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
f7853b26
Commit
f7853b26
authored
Apr 09, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed cmake configuration for Android for case when only one SDK target is available #1781
parent
2a626e1a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVDetectAndroidSDK.cmake
cmake/OpenCVDetectAndroidSDK.cmake
+1
-2
No files found.
CMakeLists.txt
View file @
f7853b26
...
@@ -655,7 +655,7 @@ include(cmake/OpenCVGenConfig.cmake REQUIRED)
...
@@ -655,7 +655,7 @@ include(cmake/OpenCVGenConfig.cmake REQUIRED)
status
(
""
)
status
(
""
)
status
(
"General configuration for OpenCV
${
OPENCV_VERSION
}
====================================="
)
status
(
"General configuration for OpenCV
${
OPENCV_VERSION
}
====================================="
)
if
(
OPENCV_SVNVERSION
)
if
(
OPENCV_SVNVERSION
)
status
(
"
svn:"
"
${
OPENCV_SVNVERSION
}
"
)
status
(
"
Version control:"
${
OPENCV_SVNVERSION
}
)
endif
()
endif
()
#build platform
#build platform
...
...
cmake/OpenCVDetectAndroidSDK.cmake
View file @
f7853b26
...
@@ -127,7 +127,6 @@ if(ANDROID_EXECUTABLE)
...
@@ -127,7 +127,6 @@ if(ANDROID_EXECUTABLE)
if
(
ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER
"2.8"
)
if
(
ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER
"2.8"
)
set_property
(
CACHE ANDROID_SDK_TARGET PROPERTY STRINGS
${
ANDROID_SDK_TARGETS
}
)
set_property
(
CACHE ANDROID_SDK_TARGET PROPERTY STRINGS
${
ANDROID_SDK_TARGETS
}
)
endif
()
endif
()
endif
(
ANDROID_EXECUTABLE
)
endif
(
ANDROID_EXECUTABLE
)
# finds minimal installed SDK target compatible with provided names or API levels
# finds minimal installed SDK target compatible with provided names or API levels
...
@@ -136,7 +135,7 @@ endif(ANDROID_EXECUTABLE)
...
@@ -136,7 +135,7 @@ endif(ANDROID_EXECUTABLE)
macro
(
android_get_compatible_target VAR
)
macro
(
android_get_compatible_target VAR
)
set
(
${
VAR
}
"
${
VAR
}
-NOTFOUND"
)
set
(
${
VAR
}
"
${
VAR
}
-NOTFOUND"
)
if
(
ANDROID_SDK_TARGETS
)
if
(
ANDROID_SDK_TARGETS
)
list
(
GET ANDROID_SDK_TARGETS
1
__lvl
)
list
(
GET ANDROID_SDK_TARGETS
0
__lvl
)
string
(
REGEX MATCH
"[0-9]+$"
__lvl
"
${
__lvl
}
"
)
string
(
REGEX MATCH
"[0-9]+$"
__lvl
"
${
__lvl
}
"
)
#find minimal level mathing to all provided levels
#find minimal level mathing to all provided levels
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment