Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
4df22ace
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,发现更多精彩内容 >>
提交
4df22ace
编写于
11月 30, 2016
作者:
V
Vitaliy Lyudvichenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Try to fix LIBTCMALLOC linking.
上级
202ba912
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
10 deletion
+19
-10
CMakeLists.txt
CMakeLists.txt
+6
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+1
-1
contrib/libtcmalloc/CMakeLists.txt
contrib/libtcmalloc/CMakeLists.txt
+2
-0
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+1
-1
libs/libcommon/CMakeLists.txt
libs/libcommon/CMakeLists.txt
+9
-8
未找到文件。
CMakeLists.txt
浏览文件 @
4df22ace
...
...
@@ -184,6 +184,12 @@ find_library (BOOST_THREAD_LIB libboost_thread.a HINTS ${BOOST_HINTS})
set
(
LTDL_HINTS
"/usr/local/opt/libtool/lib"
)
find_library
(
LTDL_LIB libltdl.a HINTS
${
LTDL_HINTS
}
)
# 5. tcmalloc
if
(
NOT DEFINED DISABLE_LIBTCMALLOC
)
set
(
DISABLE_LIBTCMALLOC $ENV{DISABLE_LIBTCMALLOC} CACHE STRING
"Don't use libtcmalloc"
FORCE
)
set
(
DEBUG_LIBTCMALLOC $ENV{DEBUG_LIBTCMALLOC} CACHE STRING
"Use debug version of libtcmalloc"
FORCE
)
endif
()
# Directory for Yandex specific files
SET
(
CLICKHOUSE_PRIVATE_DIR
${
ClickHouse_SOURCE_DIR
}
/private/
)
...
...
contrib/CMakeLists.txt
浏览文件 @
4df22ace
...
...
@@ -10,7 +10,7 @@ add_subdirectory (libpoco)
add_subdirectory
(
libre2
)
add_subdirectory
(
libzookeeper
)
if
(
NOT
$ENV{DISABLE_LIBTCMALLOC}
)
if
(
NOT
DISABLE_LIBTCMALLOC
)
add_subdirectory
(
libtcmalloc
)
endif
()
...
...
contrib/libtcmalloc/CMakeLists.txt
浏览文件 @
4df22ace
...
...
@@ -10,6 +10,8 @@ add_definitions(
include_directories
(
include src
)
message
(
STATUS
"Building: tcmalloc_minimal_internal"
)
add_library
(
tcmalloc_minimal_internal
./src/malloc_hook.cc
./src/base/spinlock_internal.cc
...
...
dbms/CMakeLists.txt
浏览文件 @
4df22ace
...
...
@@ -22,7 +22,7 @@ else()
set
(
LINK_MONGOCLIENT libmongoclient.a
${
OPENSSL_LIBS
}
${
BOOST_THREAD_LIB
}
)
endif
()
if
(
$ENV{DISABLE_LIBTCMALLOC}
)
if
(
DISABLE_LIBTCMALLOC
)
add_definitions
(
-D NO_TCMALLOC
)
endif
()
...
...
libs/libcommon/CMakeLists.txt
浏览文件 @
4df22ace
...
...
@@ -60,17 +60,18 @@ add_library (common
)
# TESTIRT-3687 DISABLE_LIBTCMALLOC - when testing for memory leaks, disable libtcmalloc
IF
(
$ENV{DISABLE_LIBTCMALLOC}
)
IF
(
DISABLE_LIBTCMALLOC
)
message
(
STATUS
"Disabling libtcmalloc for valgrind better analysis"
)
ELSE
(
$ENV{DISABLE_LIBTCMALLOC}
)
IF
(
$ENV{DEBUG_LIBTCMALLOC}
)
message
(
STATUS
"Link libtcmalloc_minimal_debug for testing"
)
SET
(
MALLOC_LIBRARIES libtcmalloc_minimal_debug.a
)
ELSE
(
$ENV{DEBUG_LIBTCMALLOC}
)
ELSE
(
DISABLE_LIBTCMALLOC
)
IF
(
DEBUG_LIBTCMALLOC
)
find_library
(
LIBTCMALLOC_DEBUG libtcmalloc_minimal_debug.a tcmalloc_minimal_debug
)
# debug version of tcmalloc from package
message
(
STATUS
"Link libtcmalloc_minimal_debug for testing from
${
LIBTCMALLOC_DEBUG
}
"
)
SET
(
MALLOC_LIBRARIES
${
LIBTCMALLOC_DEBUG
}
)
ELSE
(
DEBUG_LIBTCMALLOC
)
message
(
STATUS
"Link libtcmalloc_minimal"
)
SET
(
MALLOC_LIBRARIES tcmalloc_minimal_internal
)
ENDIF
(
$ENV{DEBUG_LIBTCMALLOC}
)
ENDIF
(
$ENV{DISABLE_LIBTCMALLOC}
)
ENDIF
(
DEBUG_LIBTCMALLOC
)
ENDIF
(
DISABLE_LIBTCMALLOC
)
if
(
APPLE
)
SET
(
RT_LIBRARIES
"apple_rt"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录