diff --git a/lite/CMakeLists.txt b/lite/CMakeLists.txt index 2da710e563c17360285924c9ed20c4bf4db08648..9a52cc8d4a1bb9782ba0c9a5e5ba9040cfe6abbd 100644 --- a/lite/CMakeLists.txt +++ b/lite/CMakeLists.txt @@ -93,7 +93,7 @@ if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM) COMMAND ${CMAKE_STRIP} "--strip-debug" ${INFER_LITE_PUBLISH_ROOT}/cxx/lib/*.a) endif() else() - if (IOS OR (ARM_TARGET_OS STREQUAL "armlinux")) + if (IOS) add_custom_target(tiny_publish_lib ${TARGET} COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/lib" COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/include" @@ -103,17 +103,17 @@ if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM) add_dependencies(tiny_publish_lib bundle_light_api) add_dependencies(publish_inference tiny_publish_lib) else() - if (ARM_TARGET_OS STREQUAL "android") + if ((ARM_TARGET_OS STREQUAL "android") OR (ARM_TARGET_OS STREQUAL "armlinux")) add_custom_target(tiny_publish_cxx_lib ${TARGET} COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/cxx" COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/cxx/include" COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/cxx/lib" COMMAND cp "${CMAKE_SOURCE_DIR}/lite/api/paddle_*.h" "${INFER_LITE_PUBLISH_ROOT}/cxx/include" COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/libpaddle_light_api_shared.so" "${INFER_LITE_PUBLISH_ROOT}/cxx/lib" - ) + ) add_dependencies(tiny_publish_cxx_lib paddle_light_api_shared) - add_dependencies(publish_inference tiny_publish_cxx_lib) - endif() + add_dependencies(publish_inference tiny_publish_cxx_lib) + endif() endif() endif() diff --git a/lite/api/CMakeLists.txt b/lite/api/CMakeLists.txt index afa1ea3b135431dd46f4f3f5ddece5e03e82e39e..80273cb69d73f98fcd0c53ad6631acb00b897899 100644 --- a/lite/api/CMakeLists.txt +++ b/lite/api/CMakeLists.txt @@ -23,7 +23,7 @@ if ((NOT LITE_ON_TINY_PUBLISH) AND (ARM_TARGET_OS STREQUAL "android")) ARM_DEPS ${arm_kernels} NPU_DEPS ${npu_kernels}) target_link_libraries(paddle_light_api_shared ${light_lib_DEPS} ${arm_kernels} ${npu_kernels}) else() - if (ARM_TARGET_OS STREQUAL "android") + if ((ARM_TARGET_OS STREQUAL "android") OR (ARM_TARGET_OS STREQUAL "armlinux")) add_library(paddle_light_api_shared SHARED "") target_sources(paddle_light_api_shared PUBLIC ${__lite_cc_files} paddle_api.cc light_api.cc light_api_impl.cc) add_dependencies(paddle_light_api_shared op_list_h kernel_list_h)