generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build for desktop

Browse Source
This commit is contained in:
Andrey Kamaev 2012-02-06 11:48:15 +00:00
parent 75ac4362ca
commit 49933c798f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -122,7 +122,7 @@ OCV_OPTION(WITH_XINE "Include Xine support (GPL)" OFF
# OpenCV build components # OpenCV build components
# =================================================== # ===================================================
if(ANDROID OR IOS) 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 6of static ones (.lib/.a)" OFF )
else() else()
OCV_OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON ) OCV_OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON )
endif() endif()
@ -458,7 +458,7 @@ if((NOT DEFINED BUILD_opencv_java OR BUILD_opencv_java) AND PYTHON_EXECUTABLE)
endif() endif()
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.") message(WARNING "Android examples are chosen for build, but required SDK tools are not found.")
unset(BUILD_ANDROID_EXAMPLES CACHE) unset(BUILD_ANDROID_EXAMPLES CACHE)
endif() endif()

2
modules/java/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# CMake file for java support # CMake file for java support
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(NOT PYTHON_EXECUTABLE) if(NOT ANDRDOID OR NOT PYTHON_EXECUTABLE)
ocv_module_disable(java) ocv_module_disable(java)
endif() endif()