diff --git a/CMakeLists.txt b/CMakeLists.txt index 3250eca8d..efc35b51c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ option(WITH_TESTING "Whether to compile with unittest." OFF) ############################# Options for Android cross compiling ######################### option(WITH_OPENCV_STATIC "Use OpenCV static lib for Android." OFF) option(WITH_LITE_STATIC "Use Paddle Lite static lib for Android." OFF) +option(WITH_OPENMP "Use OpenMP support for Android." OFF) # Please don't open this flag now, some bugs exists. # Only support Linux Now @@ -489,12 +490,15 @@ if(MSVC) target_compile_options(${LIBRARY_NAME} PRIVATE "$<$>:/wd4251>$<$>:-Xcompiler=/wd4251>") endif() -if (ANDROID) +# extra depend libs for android +if(ANDROID) find_library(log-lib log) list(APPEND DEPEND_LIBS ${log-lib}) - find_package(OpenMP) - if(OpenMP_CXX_FOUND) - list(APPEND DEPEND_LIBS OpenMP::OpenMP_CXX) + if(WITH_OPENMP) + find_package(OpenMP) + if(OpenMP_CXX_FOUND) + list(APPEND DEPEND_LIBS OpenMP::OpenMP_CXX) + endif() endif() endif() diff --git a/java/android/fastdeploy/build.gradle b/java/android/fastdeploy/build.gradle index d73e1e36f..688d8e795 100644 --- a/java/android/fastdeploy/build.gradle +++ b/java/android/fastdeploy/build.gradle @@ -31,6 +31,11 @@ android { version "3.10.2" } } + sourceSets { + main { + jniLibs.srcDirs = ['libs'] + } + } ndkVersion '20.1.5948944' }