From 293675676b11934442dfc8b299ac0ab84be2917b Mon Sep 17 00:00:00 2001 From: rainy liu Date: Sun, 25 Aug 2024 21:53:20 +0800 Subject: [PATCH] update conanfile --- conanfile.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/conanfile.py b/conanfile.py index 1892404..8d33aa8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -100,14 +100,10 @@ def build_requirements(self): # if self.settings.os == "Linux": # self.tool_requires("ffmpeg/6.1") if self.settings.os == "Android": - # ndk_path = os.environ.get("ANDROID_NDK_HOME", None) or os.environ.get( - # "ANDROID_NDK_ROOT", None - # ) - # if ndk_path is None: - # self.tool_requires("android-ndk/r26c") - self.tool_requires("android-ndk/r26d") - # if self.settings.os == "iOS": - # self.tool_requires("ios_cmake_toolchain/1.0.0") + ndk_path = os.environ.get("ANDROID_NDK_HOME", None) + ndk_path = ndk_path or os.environ.get("ANDROID_NDK_ROOT", None) + if ndk_path is None: + self.tool_requires("android-ndk/r26d") def layout(self): # self.build_folder: build/{os}/{arch}/opencv