Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
1313ec7d
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,发现更多精彩内容 >>
提交
1313ec7d
编写于
2月 17, 2020
作者:
A
Azat Khuzhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make SPLIT_SHARED_LIBRARIES=OFF more robust
Refs: #6915 Closes: #9006 Fixes: #9005
上级
c1f42f5e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
7 deletion
+3
-7
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+3
-7
未找到文件。
dbms/CMakeLists.txt
浏览文件 @
1313ec7d
...
@@ -276,6 +276,8 @@ macro(add_object_library name common_path)
...
@@ -276,6 +276,8 @@ macro(add_object_library name common_path)
list
(
APPEND all_modules
${
name
}
)
list
(
APPEND all_modules
${
name
}
)
add_headers_and_sources
(
${
name
}
${
common_path
}
)
add_headers_and_sources
(
${
name
}
${
common_path
}
)
add_library
(
${
name
}
SHARED
${${
name
}
_sources
}
${${
name
}
_headers
}
)
add_library
(
${
name
}
SHARED
${${
name
}
_sources
}
${${
name
}
_headers
}
)
# It's Ok to avoid tracking of unresolved symbols for static linkage
# because they will be resolved at link time nevertheless.
target_link_libraries
(
${
name
}
PRIVATE -Wl,--unresolved-symbols=ignore-all
)
target_link_libraries
(
${
name
}
PRIVATE -Wl,--unresolved-symbols=ignore-all
)
endif
()
endif
()
endmacro
()
endmacro
()
...
@@ -307,6 +309,7 @@ add_object_library(clickhouse_processors_sources src/Processors/Sources)
...
@@ -307,6 +309,7 @@ add_object_library(clickhouse_processors_sources src/Processors/Sources)
if
(
MAKE_STATIC_LIBRARIES OR NOT SPLIT_SHARED_LIBRARIES
)
if
(
MAKE_STATIC_LIBRARIES OR NOT SPLIT_SHARED_LIBRARIES
)
add_library
(
dbms STATIC
${
dbms_headers
}
${
dbms_sources
}
)
add_library
(
dbms STATIC
${
dbms_headers
}
${
dbms_sources
}
)
set
(
all_modules dbms
)
set
(
all_modules dbms
)
target_link_libraries
(
dbms PRIVATE -Wl,--unresolved-symbols=ignore-all
)
else
()
else
()
add_library
(
dbms SHARED
${
dbms_headers
}
${
dbms_sources
}
)
add_library
(
dbms SHARED
${
dbms_headers
}
${
dbms_sources
}
)
target_link_libraries
(
dbms PUBLIC
${
all_modules
}
)
target_link_libraries
(
dbms PUBLIC
${
all_modules
}
)
...
@@ -563,13 +566,6 @@ endif()
...
@@ -563,13 +566,6 @@ endif()
if
(
USE_JEMALLOC
)
if
(
USE_JEMALLOC
)
dbms_target_include_directories
(
SYSTEM BEFORE PRIVATE
${
JEMALLOC_INCLUDE_DIR
}
)
# used in Interpreters/AsynchronousMetrics.cpp
dbms_target_include_directories
(
SYSTEM BEFORE PRIVATE
${
JEMALLOC_INCLUDE_DIR
}
)
# used in Interpreters/AsynchronousMetrics.cpp
target_include_directories
(
clickhouse_new_delete SYSTEM BEFORE PRIVATE
${
JEMALLOC_INCLUDE_DIR
}
)
target_include_directories
(
clickhouse_new_delete SYSTEM BEFORE PRIVATE
${
JEMALLOC_INCLUDE_DIR
}
)
if
(
NOT MAKE_STATIC_LIBRARIES AND
${
JEMALLOC_LIBRARIES
}
MATCHES
"
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
$"
)
# mallctl in dbms/src/Interpreters/AsynchronousMetrics.cpp
# Actually we link JEMALLOC to almost all libraries.
# This is just hotfix for some uninvestigated problem.
target_link_libraries
(
clickhouse_interpreters PRIVATE
${
JEMALLOC_LIBRARIES
}
)
endif
()
endif
()
endif
()
dbms_target_include_directories
(
PUBLIC
${
DBMS_INCLUDE_DIR
}
)
dbms_target_include_directories
(
PUBLIC
${
DBMS_INCLUDE_DIR
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录