From bcd71b7a96fd78bfb11ab28de4da4e165a909526 Mon Sep 17 00:00:00 2001 From: wangguibao Date: Tue, 12 Mar 2019 11:15:37 +0800 Subject: [PATCH] Adjust CMakeLists.txt dependencies Change-Id: I85e3364886d8517058510c4fe73c5847a4fd8402 --- sdk-cpp/CMakeLists.txt | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sdk-cpp/CMakeLists.txt b/sdk-cpp/CMakeLists.txt index 3aee225d..9d875a1d 100644 --- a/sdk-cpp/CMakeLists.txt +++ b/sdk-cpp/CMakeLists.txt @@ -2,30 +2,35 @@ include(src/CMakeLists.txt) include(proto/CMakeLists.txt) add_library(sdk-cpp ${sdk_cpp_srcs}) add_dependencies(sdk-cpp pdcodegen configure) -target_link_libraries(sdk-cpp brpc configure protobuf leveldb) +target_link_libraries(sdk-cpp pdserving brpc configure protobuf leveldb) target_include_directories(sdk-cpp PUBLIC ${CMAKE_BINARY_DIR}/predictor/) add_executable(ximage ${CMAKE_CURRENT_LIST_DIR}/demo/ximage.cpp) target_link_libraries(ximage -Wl,--whole-archive sdk-cpp - -Wl,--no-whole-archive pdserving -lpthread -lcrypto -lm -lrt -lssl -ldl + -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_executable(echo ${CMAKE_CURRENT_LIST_DIR}/demo/echo.cpp) target_link_libraries(echo -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive - pdserving -lpthread -lcrypto -lm -lrt -lssl -ldl + -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_executable(dense_format ${CMAKE_CURRENT_LIST_DIR}/demo/dense_format.cpp) -target_link_libraries(dense_format pdserving -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl +target_link_libraries(dense_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_executable(sparse_format ${CMAKE_CURRENT_LIST_DIR}/demo/sparse_format.cpp) -target_link_libraries(sparse_format pdserving -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl +target_link_libraries(sparse_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_executable(int64tensor_format ${CMAKE_CURRENT_LIST_DIR}/demo/int64tensor_format.cpp) -target_link_libraries(int64tensor_format pdserving -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl +target_link_libraries(int64tensor_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl + -lz) + +add_executable(text_classification + ${CMAKE_CURRENT_LIST_DIR}/demo/text_classification.cpp) +target_link_libraries(text_classification -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) # install @@ -63,3 +68,9 @@ install(TARGETS int64tensor_format ${PADDLE_SERVING_INSTALL_DIR}/demo/client/int64tensor_format/bin) install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/demo/client/int64tensor_format/) + +install(TARGETS text_classification + RUNTIME DESTINATION + ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/bin) +install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION + ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/) -- GitLab