Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b7686a5f
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
b7686a5f
编写于
11月 29, 2021
作者:
sangshuduo
提交者:
GitHub
11月 29, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-11524]<fix>: cmake -DBUILD_LUA failed. (#8831)
上级
fdb6d05d
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
18 addition
and
16 deletion
+18
-16
cmake/define.inc
cmake/define.inc
+2
-0
src/client/CMakeLists.txt
src/client/CMakeLists.txt
+6
-6
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+2
-2
src/kit/shell/CMakeLists.txt
src/kit/shell/CMakeLists.txt
+2
-2
src/query/CMakeLists.txt
src/query/CMakeLists.txt
+3
-3
tests/examples/c/CMakeLists.txt
tests/examples/c/CMakeLists.txt
+3
-3
tests/examples/lua/luaconnector.so
tests/examples/lua/luaconnector.so
+0
-0
未找到文件。
cmake/define.inc
浏览文件 @
b7686a5f
...
...
@@ -193,8 +193,10 @@ ENDIF ()
IF
(
TD_BUILD_LUA
)
MESSAGE
(
"Enable lua"
)
ADD_DEFINITIONS
(
-
DLUA_EMBEDDED
)
SET
(
LINK_LUA
"lua"
)
ELSE
()
MESSAGE
(
"Disable lua"
)
SET
(
LINK_LUA
""
)
ENDIF
()
IF
(
TD_LINUX
)
...
...
src/client/CMakeLists.txt
浏览文件 @
b7686a5f
...
...
@@ -26,7 +26,7 @@ IF (TD_LINUX)
ADD_LIBRARY
(
taos SHARED
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taos common query trpc tutil pthread m rt cJson
)
IF
(
TD_LINUX_64
)
TARGET_LINK_LIBRARIES
(
taos lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos
${
LINK_LUA
}
cJson
)
ENDIF
()
SET_TARGET_PROPERTIES
(
taos PROPERTIES CLEAN_DIRECT_OUTPUT 1
)
...
...
@@ -45,13 +45,13 @@ ELSEIF (TD_DARWIN)
# set the static lib name
ADD_LIBRARY
(
taos_static STATIC
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taos_static common query trpc tutil pthread m
lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos_static common query trpc tutil pthread m
${
LINK_LUA
}
cJson
)
SET_TARGET_PROPERTIES
(
taos_static PROPERTIES OUTPUT_NAME
"taos_static"
)
SET_TARGET_PROPERTIES
(
taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1
)
# generate dynamic library (*.dylib)
ADD_LIBRARY
(
taos SHARED
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taos common query trpc tutil pthread m
lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos common query trpc tutil pthread m
${
LINK_LUA
}
cJson
)
SET_TARGET_PROPERTIES
(
taos PROPERTIES CLEAN_DIRECT_OUTPUT 1
)
#set version of .dylib
...
...
@@ -77,7 +77,7 @@ ELSEIF (TD_WINDOWS)
IF
(
NOT TD_GODLL
)
SET_TARGET_PROPERTIES
(
taos PROPERTIES LINK_FLAGS /DEF:
${
TD_COMMUNITY_DIR
}
/src/client/src/taos.def
)
ENDIF
()
TARGET_LINK_LIBRARIES
(
taos trpc tutil query
lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos trpc tutil query
${
LINK_LUA
}
cJson
)
ELSEIF
(
TD_DARWIN
)
SET
(
CMAKE_MACOSX_RPATH 1
)
...
...
@@ -85,12 +85,12 @@ ELSEIF (TD_DARWIN)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
ADD_LIBRARY
(
taos_static STATIC
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taos_static query trpc tutil pthread m
lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos_static query trpc tutil pthread m
${
LINK_LUA
}
cJson
)
SET_TARGET_PROPERTIES
(
taos_static PROPERTIES OUTPUT_NAME
"taos_static"
)
# generate dynamic library (*.dylib)
ADD_LIBRARY
(
taos SHARED
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taos query trpc tutil pthread m
lua
cJson
)
TARGET_LINK_LIBRARIES
(
taos query trpc tutil pthread m
${
LINK_LUA
}
cJson
)
SET_TARGET_PROPERTIES
(
taos PROPERTIES CLEAN_DIRECT_OUTPUT 1
)
...
...
src/dnode/CMakeLists.txt
浏览文件 @
b7686a5f
...
...
@@ -24,9 +24,9 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
ENDIF
()
IF
(
TD_BUILD_HTTP
)
TARGET_LINK_LIBRARIES
(
taosd mnode monitor http tsdb twal vnode cJson lua
lz4 balance sync
${
LINK_JEMALLOC
}
)
TARGET_LINK_LIBRARIES
(
taosd mnode monitor http tsdb twal vnode cJson
${
LINK_LUA
}
lz4 balance sync
${
LINK_JEMALLOC
}
)
ELSE
()
TARGET_LINK_LIBRARIES
(
taosd mnode monitor tsdb twal vnode cJson lua
lz4 balance sync
${
LINK_JEMALLOC
}
)
TARGET_LINK_LIBRARIES
(
taosd mnode monitor tsdb twal vnode cJson
${
LINK_LUA
}
lz4 balance sync
${
LINK_JEMALLOC
}
)
ENDIF
()
IF
(
TD_SOMODE_STATIC
)
...
...
src/kit/shell/CMakeLists.txt
浏览文件 @
b7686a5f
...
...
@@ -19,9 +19,9 @@ ELSE ()
ENDIF
()
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
shell taos_static cJson
lua
${
LINK_JEMALLOC
}
)
TARGET_LINK_LIBRARIES
(
shell taos_static cJson
${
LINK_LUA
}
${
LINK_JEMALLOC
}
)
ELSE
()
TARGET_LINK_LIBRARIES
(
shell taos cJson
lua
${
LINK_JEMALLOC
}
)
TARGET_LINK_LIBRARIES
(
shell taos cJson
${
LINK_LUA
}
${
LINK_JEMALLOC
}
)
ENDIF
()
SET_TARGET_PROPERTIES
(
shell PROPERTIES OUTPUT_NAME taos
)
...
...
src/query/CMakeLists.txt
浏览文件 @
b7686a5f
...
...
@@ -8,11 +8,11 @@ INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
query
${
SRC
}
)
SET_SOURCE_FILES_PROPERTIES
(
src/sql.c PROPERTIES COMPILE_FLAGS -w
)
TARGET_LINK_LIBRARIES
(
query tsdb tutil
lua
)
TARGET_LINK_LIBRARIES
(
query tsdb tutil
${
LINK_LUA
}
)
IF
(
TD_LINUX
)
IF
(
TD_BUILD_LUA
)
TARGET_LINK_LIBRARIES
(
query m rt lua
)
TARGET_LINK_LIBRARIES
(
query m rt
${
LINK_LUA
}
)
ELSE
()
TARGET_LINK_LIBRARIES
(
query m rt
)
ENDIF
()
...
...
@@ -21,7 +21,7 @@ ENDIF ()
IF
(
TD_DARWIN
)
IF
(
TD_BUILD_LUA
)
TARGET_LINK_LIBRARIES
(
query m lua
)
TARGET_LINK_LIBRARIES
(
query m
${
LINK_LUA
}
)
ELSE
()
TARGET_LINK_LIBRARIES
(
query m
)
ENDIF
()
...
...
tests/examples/c/CMakeLists.txt
浏览文件 @
b7686a5f
...
...
@@ -10,13 +10,13 @@ IF (TD_LINUX)
ADD_EXECUTABLE
(
subscribe subscribe.c
)
TARGET_LINK_LIBRARIES
(
subscribe taos_static trpc tutil pthread
)
ADD_EXECUTABLE
(
epoll epoll.c
)
TARGET_LINK_LIBRARIES
(
epoll taos_static trpc tutil pthread
lua
)
TARGET_LINK_LIBRARIES
(
epoll taos_static trpc tutil pthread
${
LINK_LUA
}
)
ENDIF
()
IF
(
TD_DARWIN
)
INCLUDE_DIRECTORIES
(
.
${
TD_COMMUNITY_DIR
}
/src/inc
${
TD_COMMUNITY_DIR
}
/src/client/inc
${
TD_COMMUNITY_DIR
}
/inc
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_EXECUTABLE
(
demo demo.c
)
TARGET_LINK_LIBRARIES
(
demo taos_static trpc tutil pthread
lua
)
TARGET_LINK_LIBRARIES
(
demo taos_static trpc tutil pthread
${
LINK_LUA
}
)
ADD_EXECUTABLE
(
epoll epoll.c
)
TARGET_LINK_LIBRARIES
(
epoll taos_static trpc tutil pthread
lua
)
TARGET_LINK_LIBRARIES
(
epoll taos_static trpc tutil pthread
${
LINK_LUA
}
)
ENDIF
()
tests/examples/lua/luaconnector.so
已删除
100755 → 0
浏览文件 @
fdb6d05d
文件已删除
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录