Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
4355172a
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4355172a
编写于
3月 27, 2019
作者:
P
proller
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/master' into fix26
上级
7d1be03a
7bcf8ec3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
2 deletion
+9
-2
dbms/programs/CMakeLists.txt
dbms/programs/CMakeLists.txt
+1
-0
dbms/programs/clickhouse-split-helper
dbms/programs/clickhouse-split-helper
+6
-0
debian/control
debian/control
+2
-2
未找到文件。
dbms/programs/CMakeLists.txt
浏览文件 @
4355172a
...
@@ -93,6 +93,7 @@ if (CLICKHOUSE_ONE_SHARED)
...
@@ -93,6 +93,7 @@ if (CLICKHOUSE_ONE_SHARED)
target_link_libraries
(
clickhouse-lib
${
CLICKHOUSE_SERVER_LINK
}
${
CLICKHOUSE_CLIENT_LINK
}
${
CLICKHOUSE_LOCAL_LINK
}
${
CLICKHOUSE_BENCHMARK_LINK
}
${
CLICKHOUSE_PERFORMANCE_TEST_LINK
}
${
CLICKHOUSE_COPIER_LINK
}
${
CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK
}
${
CLICKHOUSE_COMPRESSOR_LINK
}
${
CLICKHOUSE_FORMAT_LINK
}
${
CLICKHOUSE_OBFUSCATOR_LINK
}
${
CLICKHOUSE_COMPILER_LINK
}
${
CLICKHOUSE_ODBC_BRIDGE_LINK
}
)
target_link_libraries
(
clickhouse-lib
${
CLICKHOUSE_SERVER_LINK
}
${
CLICKHOUSE_CLIENT_LINK
}
${
CLICKHOUSE_LOCAL_LINK
}
${
CLICKHOUSE_BENCHMARK_LINK
}
${
CLICKHOUSE_PERFORMANCE_TEST_LINK
}
${
CLICKHOUSE_COPIER_LINK
}
${
CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK
}
${
CLICKHOUSE_COMPRESSOR_LINK
}
${
CLICKHOUSE_FORMAT_LINK
}
${
CLICKHOUSE_OBFUSCATOR_LINK
}
${
CLICKHOUSE_COMPILER_LINK
}
${
CLICKHOUSE_ODBC_BRIDGE_LINK
}
)
target_include_directories
(
clickhouse-lib
${
CLICKHOUSE_SERVER_INCLUDE
}
${
CLICKHOUSE_CLIENT_INCLUDE
}
${
CLICKHOUSE_LOCAL_INCLUDE
}
${
CLICKHOUSE_BENCHMARK_INCLUDE
}
${
CLICKHOUSE_PERFORMANCE_TEST_INCLUDE
}
${
CLICKHOUSE_COPIER_INCLUDE
}
${
CLICKHOUSE_EXTRACT_FROM_CONFIG_INCLUDE
}
${
CLICKHOUSE_COMPRESSOR_INCLUDE
}
${
CLICKHOUSE_FORMAT_INCLUDE
}
${
CLICKHOUSE_OBFUSCATOR_INCLUDE
}
${
CLICKHOUSE_COMPILER_INCLUDE
}
${
CLICKHOUSE_ODBC_BRIDGE_INCLUDE
}
)
target_include_directories
(
clickhouse-lib
${
CLICKHOUSE_SERVER_INCLUDE
}
${
CLICKHOUSE_CLIENT_INCLUDE
}
${
CLICKHOUSE_LOCAL_INCLUDE
}
${
CLICKHOUSE_BENCHMARK_INCLUDE
}
${
CLICKHOUSE_PERFORMANCE_TEST_INCLUDE
}
${
CLICKHOUSE_COPIER_INCLUDE
}
${
CLICKHOUSE_EXTRACT_FROM_CONFIG_INCLUDE
}
${
CLICKHOUSE_COMPRESSOR_INCLUDE
}
${
CLICKHOUSE_FORMAT_INCLUDE
}
${
CLICKHOUSE_OBFUSCATOR_INCLUDE
}
${
CLICKHOUSE_COMPILER_INCLUDE
}
${
CLICKHOUSE_ODBC_BRIDGE_INCLUDE
}
)
set_target_properties
(
clickhouse-lib PROPERTIES SOVERSION
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
VERSION
${
VERSION_SO
}
OUTPUT_NAME clickhouse DEBUG_POSTFIX
""
)
set_target_properties
(
clickhouse-lib PROPERTIES SOVERSION
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
VERSION
${
VERSION_SO
}
OUTPUT_NAME clickhouse DEBUG_POSTFIX
""
)
install
(
TARGETS clickhouse-lib LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
COMPONENT clickhouse
)
endif
()
endif
()
if
(
CLICKHOUSE_SPLIT_BINARY
)
if
(
CLICKHOUSE_SPLIT_BINARY
)
...
...
dbms/programs/clickhouse-split-helper
浏览文件 @
4355172a
#!/bin/sh
#!/bin/sh
# Helper for split build mode.
# Allows to run commands like
# clickhouse client
# clickhouse server
# ...
set
-e
set
-e
CMD
=
$1
CMD
=
$1
shift
shift
...
...
debian/control
浏览文件 @
4355172a
...
@@ -28,8 +28,8 @@ Package: clickhouse-common-static
...
@@ -28,8 +28,8 @@ Package: clickhouse-common-static
Architecture: any
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tzdata
Depends: ${shlibs:Depends}, ${misc:Depends}, tzdata
Suggests: clickhouse-common-static-dbg
Suggests: clickhouse-common-static-dbg
Replaces: clickhouse-server-base
Replaces: clickhouse-
common, clickhouse-
server-base
Provides: clickhouse-server-base
Provides: clickhouse-
common, clickhouse-
server-base
Description: Common files for ClickHouse
Description: Common files for ClickHouse
Yandex ClickHouse is a column-oriented database management system
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
that allows generating analytical data reports in real time.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录