Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Incubator Pegasus
提交
f5b00e27
Incubator Pegasus
项目概览
apache
/
Incubator Pegasus
通知
9
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Incubator Pegasus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f5b00e27
编写于
7月 10, 2020
作者:
zlw5307
提交者:
GitHub
7月 10, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: modify the dependent lib names which are generated by rdsn (#557)
上级
d675edaf
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
12 addition
and
17 deletion
+12
-17
rdsn
rdsn
+1
-1
src/client_lib/CMakeLists.txt
src/client_lib/CMakeLists.txt
+2
-2
src/server/CMakeLists.txt
src/server/CMakeLists.txt
+1
-2
src/server/test/CMakeLists.txt
src/server/test/CMakeLists.txt
+1
-2
src/shell/CMakeLists.txt
src/shell/CMakeLists.txt
+1
-2
src/test/function_test/CMakeLists.txt
src/test/function_test/CMakeLists.txt
+1
-1
src/test/function_test/global_env.cpp
src/test/function_test/global_env.cpp
+0
-1
src/test/function_test/global_env.h
src/test/function_test/global_env.h
+3
-4
src/test/kill_test/CMakeLists.txt
src/test/kill_test/CMakeLists.txt
+1
-1
src/test/upgrade_test/CMakeLists.txt
src/test/upgrade_test/CMakeLists.txt
+1
-1
未找到文件。
rdsn
@
4d6561d3
比较
a53199d2
...
4d6561d3
Subproject commit
a53199d2b237388852298b230cededb2100f7029
Subproject commit
4d6561d3885042548177e5d7d71e15b5cbefa99f
src/client_lib/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -13,7 +13,7 @@ target_include_directories(pegasus_client_impl_objects PUBLIC $<TARGET_PROPERTY:
set
(
pegasus_client_static_lib
${
CMAKE_CURRENT_BINARY_DIR
}
/libpegasus_client_static.a
)
add_custom_target
(
combine_lib
COMMAND ar -x
${
DSN_ROOT
}
/lib/libdsn_runtime.a
COMMAND ar -x
${
DSN_ROOT
}
/lib/libdsn_
replication_
client.a
COMMAND ar -x
${
DSN_ROOT
}
/lib/libdsn_client.a
COMMAND ar -x
${
DSN_ROOT
}
/lib/libdsn_replication_common.a
COMMAND ar -x
${
DSN_THIRDPARTY_ROOT
}
/lib/libthrift.a
COMMAND ar -x
${
CMAKE_BINARY_DIR
}
/base/libpegasus_base.a
...
...
@@ -36,7 +36,7 @@ add_library(pegasus_client_shared SHARED $<TARGET_OBJECTS:pegasus_client_impl_ob
target_link_libraries
(
pegasus_client_shared PRIVATE
pegasus_base
dsn_runtime
dsn_
replication_
client
dsn_client
dsn_replication_common
thrift
)
install
(
TARGETS pegasus_client_shared DESTINATION
"lib"
)
src/server/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -13,12 +13,11 @@ set(MY_PROJ_LIBS
dsn_replica_server
dsn_meta_server
dsn_replication_common
dsn
.replication.ddl
client
dsn
_
client
dsn.block_service.local
dsn.block_service.fds
dsn.block_service
dsn.failure_detector
dsn.failure_detector.multimaster
dsn.replication.zookeeper_provider
RocksDB::rocksdb
pegasus_reporter
...
...
src/server/test/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -18,12 +18,11 @@ set(MY_PROJ_LIBS
dsn_replica_server
dsn_meta_server
dsn_replication_common
dsn
.replication.ddl
client
dsn
_
client
dsn.block_service.local
dsn.block_service.fds
dsn.block_service
dsn.failure_detector
dsn.failure_detector.multimaster
dsn.replication.zookeeper_provider
pegasus_reporter
RocksDB::rocksdb
...
...
src/shell/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -15,12 +15,11 @@ set(MY_PROJ_LIBS
dsn.replication.tool
dsn_replica_server
dsn_replication_common
dsn
.replication.ddl
client
dsn
_
client
dsn.block_service.local
dsn.block_service.fds
dsn.block_service
dsn.failure_detector
dsn.failure_detector.multimaster
pegasus_client_static
galaxy-fds-sdk-cpp
PocoNet
...
...
src/test/function_test/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -11,7 +11,7 @@ set(MY_PROJ_SRC "")
set
(
MY_SRC_SEARCH_MODE
"GLOB"
)
set
(
MY_PROJ_LIBS
dsn
.replication.ddl
client
dsn
_
client
dsn_replication_common
pegasus_client_static
gtest
...
...
src/test/function_test/global_env.cpp
浏览文件 @
f5b00e27
...
...
@@ -14,7 +14,6 @@
#include <arpa/inet.h>
#include "global_env.h"
global_env
global_env
::
inst
;
global_env
::
global_env
()
{
...
...
src/test/function_test/global_env.h
浏览文件 @
f5b00e27
...
...
@@ -7,15 +7,13 @@
#include <string>
#include <sstream>
class
global_env
class
global_env
:
public
dsn
::
utils
::
singleton
<
global_env
>
{
public:
std
::
string
_pegasus_root
;
std
::
string
_working_dir
;
std
::
string
_host_ip
;
static
global_env
&
instance
()
{
return
inst
;
}
private:
global_env
();
global_env
(
const
global_env
&
other
)
=
delete
;
...
...
@@ -23,5 +21,6 @@ private:
void
get_hostip
();
void
get_dirs
();
static
global_env
inst
;
friend
dsn
::
utils
::
singleton
<
global_env
>
;
};
src/test/kill_test/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set
(
MY_PROJ_LIBS
pegasus_base
pegasus_client_static
dsn
.replication.ddl
client
dsn
_
client
dsn_replication_common
dsn_dist_cmd
dsn_runtime
...
...
src/test/upgrade_test/CMakeLists.txt
浏览文件 @
f5b00e27
...
...
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set
(
MY_PROJ_LIBS
pegasus_base
pegasus_client_static
dsn
.replication.ddl
client
dsn
_
client
dsn_replication_common
dsn_runtime
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录