potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-01-15 17:23:10 +03:00
parent 788c7252dc dad8af6b17
commit c739117a7c
531 changed files with 20900 additions and 12934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVDetectPython.cmake
+2 -2
View File
@@ -171,7 +171,7 @@ if(NOT ${found})
endif()
endif()
if(NOT ANDROID AND NOT IOS)
if(NOT ANDROID AND NOT IOS AND NOT XROS)
if(CMAKE_HOST_UNIX)
execute_process(COMMAND ${_executable} -c "from sysconfig import *; print(get_path('purelib'))"
RESULT_VARIABLE _cvpy_process
@@ -233,7 +233,7 @@ if(NOT ${found})
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
endif()
endif(NOT ANDROID AND NOT IOS)
endif(NOT ANDROID AND NOT IOS AND NOT XROS)
endif()
# Export return values