From 54b89607ebb6ea7a5d12b136b7b95f1259e2ce2a Mon Sep 17 00:00:00 2001
From: wangjiawei04 <wangjiawei04@baidu.com>
Date: Mon, 3 Jun 2019 10:39:14 +0800
Subject: [PATCH] modify BCLOUD

Change-Id: I3d5543fe42e618f705b0bfd90410531221266e0f
---
 BCLOUD              |  2 +-
 demo-serving/BCLOUD |  2 ++
 kvdb/BCLOUD         | 10 +++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/BCLOUD b/BCLOUD
index 789e2a1c..4ea89956 100644
--- a/BCLOUD
+++ b/BCLOUD
@@ -22,11 +22,11 @@ CONFIGS('baidu/paddlepaddle/paddle@v1.3.0_pb32@git_branch')
 NEED_OUTPUT('baidu/third-party/mklml')
 
 #sub directory
+Directory('kvdb')
 Directory('pdcodegen')
 Directory('configure')
 Directory('predictor')
 Directory('inferencer-fluid-cpu')
 Directory('demo-serving')
 Directory('sdk-cpp')
-Directory('kvdb')
 Directory('demo-client')
diff --git a/demo-serving/BCLOUD b/demo-serving/BCLOUD
index 1c7734cc..9f5b2782 100644
--- a/demo-serving/BCLOUD
+++ b/demo-serving/BCLOUD
@@ -19,6 +19,7 @@ INCPATHS('$INC')
 INCPATHS('$INC/predictor')
 INCPATHS('../')
 INCPATHS('../predictor/')
+INCPATHS('../kvdb/include/')
 INCPATHS('$OUT_ROOT/third-64/protobuf/output/include')
 INCPATHS('$OUT_ROOT/baidu/third-party/gflags/output/include')
 INCPATHS('$OUT_ROOT/baidu/third-party/glog/output/include')
@@ -29,6 +30,7 @@ LIBS('$OUT/lib/libpdconfigure.a')
 LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libmklml_intel.so')
 LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libmklml_gnu.so')
 LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libiomp5.so')
+LIBS('$OUT/lib/libkvdb.a')
 
 cpp_source_dirs = []
 cpp_source_dirs.append('op/*.cpp')
diff --git a/kvdb/BCLOUD b/kvdb/BCLOUD
index 93e3abf4..9229e459 100644
--- a/kvdb/BCLOUD
+++ b/kvdb/BCLOUD
@@ -15,15 +15,19 @@ LIBS('$OUT_ROOT/baidu//third-party/rocksdb/output/lib/librocksdb.a')
 cpp_base_source_files = [
 'mock_param_dict_impl.cpp', 'paddle_rocksdb.cpp', 'param_dict_mgr_impl.cpp', 'rockskvdb_impl.cpp'
 ]
+cpp_db_func_files = list(cpp_base_source_files)
+cpp_db_thread_files = list(cpp_base_source_files)
+cpp_kvdb_test_files = list(cpp_base_source_files)
 
-cpp_db_func_files = cpp_base_source_files.append('gtest_db_func.cpp')
-cpp_db_thread_files = cpp_base_source_files.append('gtest_db_thread.cpp')
-cpp_kvdb_test_files = cpp_base_source_files.append('gtest_kvdb.cpp')
+cpp_db_func_files.append('gtest_db_func.cpp')
+cpp_db_thread_files.append('gtest_db_thread.cpp')
+cpp_kvdb_test_files.append('gtest_kvdb.cpp')
 
 # Application
 
 HEADERS('./include/kvdb/*.h', '$INC/kvdb/')
 
+StaticLibrary('kvdb', Sources(GLOB(' '.join(cpp_base_source_files))));
 Application('kvdb_test', Sources(GLOB(' '.join(cpp_kvdb_test_files))))
 Application('db_func', Sources(GLOB(' '.join(cpp_db_func_files))))
 Application('db_thread', Sources(GLOB(' '.join(cpp_db_thread_files))))
-- 
GitLab