You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

host_android.patch 2.7 kB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index f6a2da5310..10354312c9 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -643,7 +643,7 @@ if(UNIX)
  6. if(NOT APPLE)
  7. CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD)
  8. if(ANDROID)
  9. - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
  10. + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log z)
  11. elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku")
  12. set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
  13. elseif(EMSCRIPTEN)
  14. diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
  15. index 4ff02a77d3..db1305448f 100644
  16. --- a/cmake/OpenCVDetectPython.cmake
  17. +++ b/cmake/OpenCVDetectPython.cmake
  18. @@ -123,7 +123,7 @@ if(NOT ${found})
  19. if(_found)
  20. set(_version_major_minor "${_version_major}.${_version_minor}")
  21. - if(NOT ANDROID AND NOT APPLE_FRAMEWORK)
  22. + if(TRUE)
  23. ocv_check_environment_variables(${library_env} ${include_dir_env})
  24. if(NOT ${${library_env}} STREQUAL "")
  25. set(PYTHON_LIBRARY "${${library_env}}")
  26. @@ -175,7 +175,7 @@ if(NOT ${found})
  27. endif()
  28. endif()
  29. - if(NOT ANDROID AND NOT IOS)
  30. + if(TRUE)
  31. if(CMAKE_HOST_UNIX)
  32. execute_process(COMMAND ${_executable} -c "from distutils.sysconfig import *; print(get_python_lib())"
  33. RESULT_VARIABLE _cvpy_process
  34. @@ -240,7 +240,7 @@ if(NOT ${found})
  35. OUTPUT_STRIP_TRAILING_WHITESPACE)
  36. endif()
  37. endif()
  38. - endif(NOT ANDROID AND NOT IOS)
  39. + endif()
  40. endif()
  41. # Export return values
  42. @@ -285,6 +285,17 @@ find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYT
  43. PYTHON3_INCLUDE_DIR PYTHON3_INCLUDE_DIR2 PYTHON3_PACKAGES_PATH
  44. PYTHON3_NUMPY_INCLUDE_DIRS PYTHON3_NUMPY_VERSION)
  45. +message("DEBUG PYTHON3_LIBRARIES: ${PYTHON3_LIBRARIES}")
  46. +message("DEBUG PYTHON3_INCLUDE_DIR: ${PYTHON3_INCLUDE_DIR}")
  47. +string(COMPARE EQUAL "${PYTHON3_LIBRARIES}" "" result)
  48. +if(result)
  49. + message(FATAL_ERROR "can not find PYTHON3_LIBRARIES")
  50. +endif()
  51. +
  52. +string(COMPARE EQUAL "${PYTHON3_INCLUDE_DIR}" "" result)
  53. +if(result)
  54. + message(FATAL_ERROR "can not find PYTHON3_INCLUDE_DIR")
  55. +endif()
  56. if(PYTHON_DEFAULT_EXECUTABLE)
  57. set(PYTHON_DEFAULT_AVAILABLE "TRUE")
  58. diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
  59. index a51acf386e..5605a54a32 100644
  60. --- a/modules/python/CMakeLists.txt
  61. +++ b/modules/python/CMakeLists.txt
  62. @@ -3,7 +3,7 @@
  63. # ----------------------------------------------------------------------------
  64. if(DEFINED OPENCV_INITIAL_PASS) # OpenCV build
  65. -if(ANDROID OR APPLE_FRAMEWORK OR WINRT)
  66. + if(False)
  67. ocv_module_disable_(python2)
  68. ocv_module_disable_(python3)
  69. return()