Merge branch 'develop' into develop

80874cf8 · TeslaZhao · GitHub · 49a7d935 · a282d77c · 80874cf8
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

cmake/paddlepaddle.cmake cmake/paddlepaddle.cmake +2 -1

未找到文件。
--- a/cmake/paddlepaddle.cmake
+++ b/cmake/paddlepaddle.cmake
@@ -192,7 +192,8 @@ endif()
 ADD_LIBRARY(paddle_inference STATIC IMPORTED GLOBAL)
 SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.a)
-if (WITH_ASCEND_CL)
+if (WITH_ASCEND_CL OR WITH_XPU)
    SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.so)
 endif()