From 8c4242b1a522315e238874fe30557a386720bd53 Mon Sep 17 00:00:00 2001 From: wangguibao Date: Fri, 1 Nov 2019 16:54:42 +0800 Subject: [PATCH] Elastic CTR --- elastic-ctr/client/CMakeLists.txt | 14 +++++++++++++- sdk-cpp/include/common.h | 5 ++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/elastic-ctr/client/CMakeLists.txt b/elastic-ctr/client/CMakeLists.txt index 4aee9099..3d93fc5e 100644 --- a/elastic-ctr/client/CMakeLists.txt +++ b/elastic-ctr/client/CMakeLists.txt @@ -33,14 +33,26 @@ install(FILES ${CMAKE_BINARY_DIR}/elastic-ctr/client/builtin_format.pb.h DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/elastic_ctr/api/include/elastic-ctr/client/) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/sdk-cpp/include +install(DIRECTORY + ${CMAKE_SOURCE_DIR}/sdk-cpp/include DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/elastic_ctr/api/include/sdk-cpp/) +install(DIRECTORY + ${CMAKE_SOURCE_DIR}/configure/include + DESTINATION + ${PADDLE_SERVING_INSTALL_DIR}/elastic_ctr/api/include/configure) +install(FILES + ${CMAKE_BINARY_DIR}/configure/sdk_configure.pb.h + DESTINATION + ${PADDLE_SERVING_INSTALL_DIR}/elastic_ctr/api/include/configure) + install(DIRECTORY ${CMAKE_BINARY_DIR}/third_party/install/protobuf/include/google ${CMAKE_BINARY_DIR}/third_party/install/brpc/include/brpc ${CMAKE_BINARY_DIR}/third_party/install/brpc/include/butil ${CMAKE_BINARY_DIR}/third_party/install/brpc/include/bthread + ${CMAKE_BINARY_DIR}/third_party/install/brpc/include/bvar + ${CMAKE_BINARY_DIR}/third_party/install/brpc/include/json2pb ${CMAKE_BINARY_DIR}/third_party/install/gflags/include/gflags ${CMAKE_BINARY_DIR}/third_party/install/glog/include/glog DESTINATION diff --git a/sdk-cpp/include/common.h b/sdk-cpp/include/common.h index 19a37650..618b5329 100644 --- a/sdk-cpp/include/common.h +++ b/sdk-cpp/include/common.h @@ -23,7 +23,6 @@ #include #include -#include "boost/unordered_map.hpp" #include "gflags/gflags.h" #include "google/protobuf/message.h" @@ -35,7 +34,7 @@ #include "base/logging.h" #include "base/object_pool.h" #include "base/time.h" -#include "bthread.h" +#include "bthread.h" // NOLINT #else #include "brpc/channel.h" #include "brpc/parallel_channel.h" @@ -49,7 +48,7 @@ #include "bvar/bvar.h" #ifdef BCLOUD -#include "json_to_pb.h" +#include "json_to_pb.h" // NOLINT #else #include "json2pb/json_to_pb.h" #endif -- GitLab