mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Merge pull request #24562 from savuor:fix_build_sdk
Fix for Android build script: CMake vars
This commit is contained in:
commit
559c0a0eb1
@ -250,15 +250,16 @@ class Builder:
|
|||||||
cmake_vars['BUILD_SHARED_LIBS'] = "ON"
|
cmake_vars['BUILD_SHARED_LIBS'] = "ON"
|
||||||
|
|
||||||
if self.config.modules_list is not None:
|
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:
|
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:
|
if self.use_ccache == True:
|
||||||
cmd.append("-DNDK_CCACHE=ccache")
|
cmake_vars['NDK_CCACHE'] = 'ccache'
|
||||||
if do_install:
|
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:
|
if no_media_ndk:
|
||||||
cmake_vars['WITH_ANDROID_MEDIANDK'] = "OFF"
|
cmake_vars['WITH_ANDROID_MEDIANDK'] = "OFF"
|
||||||
|
Loading…
Reference in New Issue
Block a user