Fixed build for desktop

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44e503a..ca181e7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 6of 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()

diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index 518473e..f7dcf46 100644 (file)
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #  CMake file for java support
 # ----------------------------------------------------------------------------
-if(NOT PYTHON_EXECUTABLE)
+if(NOT ANDRDOID OR NOT PYTHON_EXECUTABLE)
   ocv_module_disable(java)
 endif()