Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
74e833cf
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
74e833cf
编写于
7月 28, 2022
作者:
wafwerar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build: remove jemalloc submodule
上级
7788bcb1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
42 addition
and
3 deletion
+42
-3
.gitmodules
.gitmodules
+0
-3
cmake/cmake.options
cmake/cmake.options
+6
-0
cmake/jemalloc_CMakeLists.txt.in
cmake/jemalloc_CMakeLists.txt.in
+14
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+16
-0
source/dnode/mgmt/CMakeLists.txt
source/dnode/mgmt/CMakeLists.txt
+3
-0
tools/shell/CMakeLists.txt
tools/shell/CMakeLists.txt
+3
-0
未找到文件。
.gitmodules
浏览文件 @
74e833cf
...
...
@@ -4,9 +4,6 @@
[submodule "src/connector/hivemq-tdengine-extension"]
path = src/connector/hivemq-tdengine-extension
url = git@github.com:taosdata/hivemq-tdengine-extension.git
[submodule "deps/jemalloc"]
path = deps/jemalloc
url = https://github.com/jemalloc/jemalloc
[submodule "deps/TSZ"]
path = deps/TSZ
url = https://github.com/taosdata/TSZ.git
...
...
cmake/cmake.options
浏览文件 @
74e833cf
...
...
@@ -84,6 +84,12 @@ ELSE ()
ENDIF ()
ENDIF ()
option(
JEMALLOC_ENABLED
"If build with jemalloc"
OFF
)
option(
BUILD_SANITIZER
"If build sanitizer"
...
...
cmake/jemalloc_CMakeLists.txt.in
0 → 100644
浏览文件 @
74e833cf
# jemalloc
ExternalProject_Add(jemalloc
GIT_REPOSITORY https://github.com/jemalloc/jemalloc.git
GIT_TAG 5.3.0
SOURCE_DIR "${TD_CONTRIB_DIR}/jemalloc"
BINARY_DIR ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
GIT_SHALLOW true
GIT_PROGRESS true
)
contrib/CMakeLists.txt
浏览文件 @
74e833cf
...
...
@@ -27,6 +27,10 @@ else ()
cat
(
"
${
TD_SUPPORT_DIR
}
/taosadapter_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
()
if
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
cat
(
"
${
TD_SUPPORT_DIR
}
/jemalloc_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
()
# pthread
if
(
${
BUILD_PTHREAD
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/pthread_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
...
...
@@ -399,6 +403,18 @@ if(${BUILD_ADDR2LINE})
endif
(
NOT
${
TD_WINDOWS
}
)
endif
(
${
BUILD_ADDR2LINE
}
)
# jemalloc
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
include
(
ExternalProject
)
ExternalProject_Add
(
jemalloc
PREFIX
"jemalloc"
SOURCE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/jemalloc
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=
${
CMAKE_BINARY_DIR
}
/build/
BUILD_COMMAND
${
MAKE
}
)
INCLUDE_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/build/include
)
ENDIF
()
# ================================================================================================
# Build test
...
...
source/dnode/mgmt/CMakeLists.txt
浏览文件 @
74e833cf
...
...
@@ -14,4 +14,7 @@ target_include_directories(
taosd
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/node_mgmt/inc"
)
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
add_dependencies
(
taosd jemalloc
)
ENDIF
()
target_link_libraries
(
taosd dnode
)
tools/shell/CMakeLists.txt
浏览文件 @
74e833cf
...
...
@@ -24,4 +24,7 @@ target_include_directories(
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc"
)
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
add_dependencies
(
taosd jemalloc
)
ENDIF
()
SET_TARGET_PROPERTIES
(
shell PROPERTIES OUTPUT_NAME taos
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录