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
0ae40507
Commit
0ae40507
authored
May 29, 2013
by
Roman Donchenko
Committed by
OpenCV Buildbot
May 29, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #928 from apavlenko:bugfix_3027
parents
fbb25787
e28f6fae
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
CMakeLists.txt
CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
0ae40507
...
...
@@ -402,7 +402,7 @@ if(ANDROID)
if
(
NOT ANDROID_TOOLS_Pkg_Revision GREATER 13
)
message
(
WARNING
"OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled."
)
endif
()
else
if
(
ANT_EXECUTABLE
)
else
(
)
find_package
(
JNI
)
endif
()
...
...
@@ -830,7 +830,7 @@ status(" ant:" ANT_EXECUTABLE THEN "${ANT_EXECUTABLE} (ver ${A
if
(
NOT ANDROID
)
status
(
" JNI:"
JNI_INCLUDE_DIRS THEN
"
${
JNI_INCLUDE_DIRS
}
"
ELSE NO
)
endif
()
status
(
" Java tests:"
BUILD_TESTS
AND
(
NOT ANDROID OR CAN_BUILD_ANDROID_PROJECTS
)
THEN YES ELSE NO
)
status
(
" Java tests:"
BUILD_TESTS
AND
(
CAN_BUILD_ANDROID_PROJECTS OR HAVE_opencv_java
)
THEN YES ELSE NO
)
# ========================== documentation ==========================
if
(
BUILD_DOCS
)
...
...
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