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
49933c79
Commit
49933c79
authored
Feb 06, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build for desktop
parent
75ac4362
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
CMakeLists.txt
+2
-2
CMakeLists.txt
modules/java/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
49933c79
...
...
@@ -122,7 +122,7 @@ OCV_OPTION(WITH_XINE "Include Xine support (GPL)" OFF
# OpenCV build components
# ===================================================
if
(
ANDROID OR IOS
)
OCV_OPTION
(
BUILD_SHARED_LIBS
"Build shared libraries (.dll/.so) instead of static ones (.lib/.a)"
OFF
)
OCV_OPTION
(
BUILD_SHARED_LIBS
"Build shared libraries (.dll/.so) instead
6
of static ones (.lib/.a)"
OFF
)
else
()
OCV_OPTION
(
BUILD_SHARED_LIBS
"Build shared libraries (.dll/.so) instead of static ones (.lib/.a)"
ON
)
endif
()
...
...
@@ -458,7 +458,7 @@ if((NOT DEFINED BUILD_opencv_java OR BUILD_opencv_java) AND PYTHON_EXECUTABLE)
endif
()
endif
()
if
(
NOT CAN_BUILD_ANDROID_PROJECTS
)
if
(
BUILD_ANDROID_EXAMPLES AND
NOT CAN_BUILD_ANDROID_PROJECTS
)
message
(
WARNING
"Android examples are chosen for build, but required SDK tools are not found."
)
unset
(
BUILD_ANDROID_EXAMPLES CACHE
)
endif
()
...
...
modules/java/CMakeLists.txt
View file @
49933c79
# ----------------------------------------------------------------------------
# CMake file for java support
# ----------------------------------------------------------------------------
if
(
NOT PYTHON_EXECUTABLE
)
if
(
NOT
ANDRDOID OR NOT
PYTHON_EXECUTABLE
)
ocv_module_disable
(
java
)
endif
()
...
...
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