1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2024-02-16 18:45:22 +03:00
26 changed files with 441 additions and 89 deletions
+5 -4
View File
@@ -250,15 +250,16 @@ class Builder:
cmake_vars['BUILD_SHARED_LIBS'] = "ON"
if self.config.modules_list is not None:
cmd.append("-DBUILD_LIST='%s'" % self.config.modules_list)
cmake_vars['BUILD_LIST'] = '%s' % self.config.modules_list
if self.config.extra_modules_path is not None:
cmd.append("-DOPENCV_EXTRA_MODULES_PATH='%s'" % self.config.extra_modules_path)
cmake_vars['OPENCV_EXTRA_MODULES_PATH'] = '%s' % self.config.extra_modules_path
if self.use_ccache == True:
cmd.append("-DNDK_CCACHE=ccache")
cmake_vars['NDK_CCACHE'] = 'ccache'
if do_install:
cmd.extend(["-DBUILD_TESTS=ON", "-DINSTALL_TESTS=ON"])
cmake_vars['BUILD_TESTS'] = "ON"
cmake_vars['INSTALL_TESTS'] = "ON"
if no_media_ndk:
cmake_vars['WITH_ANDROID_MEDIANDK'] = "OFF"