Skip to content

Commit

Permalink
Revert "fix windows bug for common lib (PaddlePaddle#60308)"
Browse files Browse the repository at this point in the history
This reverts commit 1b696a1.
  • Loading branch information
hanhaowen-mt committed May 13, 2024
1 parent 3a90519 commit 08e8406
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions cmake/inference_lib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,6 @@ copy_part_of_thrid_party(inference_lib_dist ${PADDLE_INFERENCE_INSTALL_DIR})

set(src_dir "${PADDLE_SOURCE_DIR}/paddle/fluid")

if(WIN32)
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/common.*)
else()
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/libcommon.*)
endif()
copy(
inference_lib_dist
SRCS ${paddle_common_lib}
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)

if(WIN32)
if(WITH_STATIC_LIB)
set(paddle_inference_lib
Expand Down Expand Up @@ -278,6 +268,11 @@ else()
SRCS ${paddle_phi_lib}
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
endif()
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/libcommon.*)
copy(
inference_lib_dist
SRCS ${paddle_common_lib}
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
endif()

copy(
Expand Down

0 comments on commit 08e8406

Please sign in to comment.