This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new a1bdfea fix: add library dependencies to fix compiler error (#584)
a1bdfea is described below
commit a1bdfeaf0ae08a5861518b256573e71822e2b64e
Author: Wu Tao <[email protected]>
AuthorDate: Tue Aug 25 09:51:35 2020 +0800
fix: add library dependencies to fix compiler error (#584)
---
rdsn | 2 +-
src/base/CMakeLists.txt | 2 +-
src/server/info_collector_app.h | 2 +-
src/test/bench_test/CMakeLists.txt | 3 +++
src/test/function_test/CMakeLists.txt | 3 +++
src/test/kill_test/CMakeLists.txt | 3 +++
src/test/pressure_test/CMakeLists.txt | 3 +++
src/test/upgrade_test/CMakeLists.txt | 3 +++
8 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/rdsn b/rdsn
index 40d86f7..abd93ac 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 40d86f7f7aa51ba874d9cc91cb7e267f18b2bd11
+Subproject commit abd93ac1b7b3c13e620e9018415ed3c8b1de6e53
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 86936ff..b3afc8f 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -13,5 +13,5 @@ set(MY_PROJ_SRC "")
dsn_add_static_library()
-target_link_libraries(pegasus_base PUBLIC RocksDB::rocksdb)
+target_link_libraries(pegasus_base PUBLIC RocksDB::rocksdb sasl2 gssapi_krb5
krb5)
target_include_directories(pegasus_base PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
diff --git a/src/server/info_collector_app.h b/src/server/info_collector_app.h
index fad34bf..3774add 100644
--- a/src/server/info_collector_app.h
+++ b/src/server/info_collector_app.h
@@ -5,7 +5,7 @@
#pragma once
#include <dsn/cpp/service_app.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
#include "info_collector.h"
#include "available_detector.h"
diff --git a/src/test/bench_test/CMakeLists.txt
b/src/test/bench_test/CMakeLists.txt
index c0a6b42..b7c4957 100644
--- a/src/test/bench_test/CMakeLists.txt
+++ b/src/test/bench_test/CMakeLists.txt
@@ -14,6 +14,9 @@ set(MY_PROJ_LIBS
pegasus_client_static
dsn_utils
RocksDB::rocksdb
+ sasl2
+ gssapi_krb5
+ krb5
)
set(MY_BOOST_LIBS Boost::system Boost::filesystem)
diff --git a/src/test/function_test/CMakeLists.txt
b/src/test/function_test/CMakeLists.txt
index 9babef8..451f6c8 100644
--- a/src/test/function_test/CMakeLists.txt
+++ b/src/test/function_test/CMakeLists.txt
@@ -16,6 +16,9 @@ set(MY_PROJ_LIBS
dsn_utils
pegasus_client_static
gtest
+ sasl2
+ gssapi_krb5
+ krb5
)
set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
diff --git a/src/test/kill_test/CMakeLists.txt
b/src/test/kill_test/CMakeLists.txt
index 0b9823a..83dad4f 100644
--- a/src/test/kill_test/CMakeLists.txt
+++ b/src/test/kill_test/CMakeLists.txt
@@ -18,6 +18,9 @@ set(MY_PROJ_LIBS
dsn_dist_cmd
dsn_runtime
dsn_utils
+ sasl2
+ gssapi_krb5
+ krb5
)
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
diff --git a/src/test/pressure_test/CMakeLists.txt
b/src/test/pressure_test/CMakeLists.txt
index e0727dd..352c680 100644
--- a/src/test/pressure_test/CMakeLists.txt
+++ b/src/test/pressure_test/CMakeLists.txt
@@ -13,6 +13,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS
pegasus_client_static
dsn_utils
+ sasl2
+ gssapi_krb5
+ krb5
)
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-pressure.ini")
diff --git a/src/test/upgrade_test/CMakeLists.txt
b/src/test/upgrade_test/CMakeLists.txt
index c1004bb..da84527 100644
--- a/src/test/upgrade_test/CMakeLists.txt
+++ b/src/test/upgrade_test/CMakeLists.txt
@@ -17,6 +17,9 @@ set(MY_PROJ_LIBS
dsn_replication_common
dsn_runtime
dsn_utils
+ sasl2
+ gssapi_krb5
+ krb5
)
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
