Skip to content

Commit 08e8406

Browse files
committed
Revert "fix windows bug for common lib (PaddlePaddle#60308)"
This reverts commit 1b696a1.
1 parent 3a90519 commit 08e8406

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

cmake/inference_lib.cmake

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,6 @@ copy_part_of_thrid_party(inference_lib_dist ${PADDLE_INFERENCE_INSTALL_DIR})
237237

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

240-
if(WIN32)
241-
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/common.*)
242-
else()
243-
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/libcommon.*)
244-
endif()
245-
copy(
246-
inference_lib_dist
247-
SRCS ${paddle_common_lib}
248-
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
249-
250240
if(WIN32)
251241
if(WITH_STATIC_LIB)
252242
set(paddle_inference_lib
@@ -278,6 +268,11 @@ else()
278268
SRCS ${paddle_phi_lib}
279269
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
280270
endif()
271+
set(paddle_common_lib ${PADDLE_BINARY_DIR}/paddle/common/libcommon.*)
272+
copy(
273+
inference_lib_dist
274+
SRCS ${paddle_common_lib}
275+
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
281276
endif()
282277

283278
copy(

0 commit comments

Comments
 (0)