Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
342ce14c
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1185
Star
22015
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看板
提交
342ce14c
编写于
5月 29, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge branch 'enh/3.0' into fix/shared_link_rocksdb
上级
58cc631c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
39 addition
and
3 deletion
+39
-3
cmake/cmake.define
cmake/cmake.define
+2
-2
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+4
-1
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+23
-0
source/libs/stream/CMakeLists.txt
source/libs/stream/CMakeLists.txt
+10
-0
未找到文件。
cmake/cmake.define
浏览文件 @
342ce14c
...
...
@@ -123,8 +123,8 @@ ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g
dwarf-2 -g3
-Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -
Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3
-Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g
3 -gdwarf-2
-Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -
g3-Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2
-Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ENDIF ()
# disable all assert
...
...
contrib/CMakeLists.txt
浏览文件 @
342ce14c
...
...
@@ -268,8 +268,11 @@ if(${BUILD_WITH_ROCKSDB})
option
(
WITH_BENCHMARK_TOOLS
""
OFF
)
option
(
WITH_TOOLS
""
OFF
)
option
(
WITH_LIBURING
""
OFF
)
IF
(
TD_LINUX
)
option
(
ROCKSDB_BUILD_SHARED
"Build shared versions of the RocksDB libraries"
ON
)
ELSE
()
option
(
ROCKSDB_BUILD_SHARED
"Build shared versions of the RocksDB libraries"
OFF
)
ENDIF
()
add_subdirectory
(
rocksdb EXCLUDE_FROM_ALL
)
target_include_directories
(
rocksdb
...
...
source/dnode/vnode/CMakeLists.txt
浏览文件 @
342ce14c
...
...
@@ -87,6 +87,7 @@ target_include_directories(
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/scalar"
PUBLIC
"
${
TD_SOURCE_DIR
}
/contrib/rocksdb/include"
)
IF
(
TD_LINUX
)
target_link_libraries
(
vnode
PUBLIC os
...
...
@@ -107,6 +108,28 @@ target_link_libraries(
PUBLIC stream
PUBLIC index
)
ELSE
()
target_link_libraries
(
vnode
PUBLIC os
PUBLIC util
PUBLIC common
PUBLIC tfs
PUBLIC wal
PUBLIC qworker
PUBLIC sync
PUBLIC executor
PUBLIC scheduler
PUBLIC tdb
# PUBLIC bdb
# PUBLIC scalar
PUBLIC rocksdb
PUBLIC transport
PUBLIC stream
PUBLIC index
)
ENDIF
()
IF
(
TD_GRANT
)
TARGET_LINK_LIBRARIES
(
vnode PUBLIC grant
)
...
...
source/libs/stream/CMakeLists.txt
浏览文件 @
342ce14c
...
...
@@ -6,12 +6,22 @@ target_include_directories(
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc"
)
if
(
${
BUILD_WITH_ROCKSDB
}
)
IF
(
TD_LINUX
)
target_link_libraries
(
stream
PUBLIC rocksdb-shared tdb
PRIVATE os util transport qcom executor wal index
)
ELSE
()
target_link_libraries
(
stream
PUBLIC rocksdb tdb
PRIVATE os util transport qcom executor wal index
)
ENDIF
()
target_include_directories
(
stream
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录