Commit 49933c79 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed build for desktop

parent 75ac4362
...@@ -122,7 +122,7 @@ OCV_OPTION(WITH_XINE "Include Xine support (GPL)" OFF ...@@ -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) ...@@ -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()
......
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# 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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment