diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 1585f5674..a0a397f6c 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -1,4 +1,5 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +# >=3.17 support -DCMAKE_FIND_DEBUG_MODE=ON +cmake_minimum_required(VERSION 3.17 FATAL_ERROR) set(CMAKE_PROJECT_INCLUDE_BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/EnableCMP0048.cmake") @@ -32,6 +33,7 @@ get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR set(FETCHCONTENT_BASE_DIR ${fc_patch}) set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_FIND_DEBUG_MODE OFF) set(PPS_CXX_STANDARD 14) # set std-14 @@ -47,6 +49,14 @@ SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} --std=c++14 -pthread -fPIC -O3 -Wall # install dir into `build/install` set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install) +# find_* e.g. find_library work when Cross-Compiling +if(ANDROID) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) +endif() + ############################################################################### # Option Configurations ############################################################################### diff --git a/runtime/build_android.sh b/runtime/build_android.sh index 29ea2df0c..ac3980a8f 100755 --- a/runtime/build_android.sh +++ b/runtime/build_android.sh @@ -14,7 +14,7 @@ TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake # Create build directory BUILD_ROOT=build/Android BUILD_DIR=${BUILD_ROOT}/${ANDROID_ABI}-api-21 -FASDEPLOY_INSTALL_DIR="/workspace/zhanghui/paddle/FastDeploy/build/Android/arm64-v8a-api-21/install" +FASTDEPLOY_INSTALL_DIR="/workspace/zhanghui/paddle/FastDeploy/build/Android/arm64-v8a-api-21/install" mkdir -p ${BUILD_DIR} cd ${BUILD_DIR} @@ -27,9 +27,12 @@ cmake -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \ -DANDROID_PLATFORM=${ANDROID_PLATFORM} \ -DANDROID_STL=${ANDROID_STL} \ -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} \ + -DBUILD_SHARED_LIBS=OFF \ -DWITH_ASR=OFF \ -DWITH_CLS=OFF \ + -DWITH_VAD=ON \ -DFASTDEPLOY_INSTALL_DIR=${FASTDEPLOY_INSTALL_DIR} \ + -DCMAKE_FIND_DEBUG_MODE=OFF \ -Wno-dev ../../.. # Build FastDeploy Android C++ SDK diff --git a/runtime/cmake/fastdeploy.cmake b/runtime/cmake/fastdeploy.cmake index fa72bafea..b7c9a8ddb 100644 --- a/runtime/cmake/fastdeploy.cmake +++ b/runtime/cmake/fastdeploy.cmake @@ -84,9 +84,6 @@ if(ENABLE_VISION) file(GLOB_RECURSE ALL_OPENCV_DYN_LIBS ${OpenCV_DIR}/../../${DYN_LIB_SUFFIX}) endif() - message(STATUS "ALL_DEPS_DYN_LIBS=${ALL_DEPS_DYN_LIBS}") - message(STATUS "OpenCV_DIR=${OpenCV_DIR}") - message(STATUS "ALL_OPENCV_DYN_LIBS=${ALL_OPENCV_DYN_LIBS}") list(REMOVE_ITEM ALL_DEPS_DYN_LIBS ${ALL_OPENCV_DYN_LIBS}) if(WIN32) @@ -119,4 +116,4 @@ endif() # Install other libraries install(FILES ${ALL_NEED_DYN_LIBS} DESTINATION lib) -install(FILES ${ALL_DEPS_DYN_LIBS} DESTINATION lib) \ No newline at end of file +install(FILES ${ALL_DEPS_DYN_LIBS} DESTINATION lib)