Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mz丶苗
TDengine
提交
94c11e0f
T
TDengine
项目概览
Mz丶苗
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
94c11e0f
编写于
8月 20, 2020
作者:
H
Hui Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-1162]
上级
4104f7f4
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
52 addition
and
17 deletion
+52
-17
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/input.inc
cmake/input.inc
+5
-0
packaging/release.sh
packaging/release.sh
+10
-3
src/cq/CMakeLists.txt
src/cq/CMakeLists.txt
+5
-1
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+6
-2
src/kit/shell/CMakeLists.txt
src/kit/shell/CMakeLists.txt
+4
-4
src/kit/taosdemo/CMakeLists.txt
src/kit/taosdemo/CMakeLists.txt
+4
-4
src/plugins/http/CMakeLists.txt
src/plugins/http/CMakeLists.txt
+6
-1
src/plugins/monitor/CMakeLists.txt
src/plugins/monitor/CMakeLists.txt
+6
-1
src/plugins/mqtt/CMakeLists.txt
src/plugins/mqtt/CMakeLists.txt
+5
-1
未找到文件。
CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -18,6 +18,7 @@ SET(TD_COVER FALSE)
SET
(
TD_MEM_CHECK FALSE
)
SET
(
TD_PAGMODE_LITE FALSE
)
SET
(
TD_SOMODE_STATIC FALSE
)
SET
(
TD_GODLL FALSE
)
SET
(
TD_COMMUNITY_DIR
${
PROJECT_SOURCE_DIR
}
)
...
...
cmake/input.inc
浏览文件 @
94c11e0f
...
...
@@ -22,6 +22,11 @@ IF (${PAGMODE} MATCHES "lite")
MESSAGE
(
STATUS
"Build with pagmode lite"
)
ENDIF
()
IF
(
$
{
SOMODE
}
MATCHES
"static"
)
SET
(
TD_SOMODE_STATIC
TRUE
)
MESSAGE
(
STATUS
"Link so using static mode"
)
ENDIF
()
IF
(
$
{
DLLTYPE
}
MATCHES
"go"
)
SET
(
TD_GODLL
TRUE
)
MESSAGE
(
STATUS
"input dll type: "
$
{
DLLTYPE
})
...
...
packaging/release.sh
浏览文件 @
94c11e0f
...
...
@@ -10,6 +10,7 @@ set -e
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
# -V [stable | beta]
# -l [full | lite]
# -s [static | dynamic]
# -n [2.0.0.3]
# set parameters by default value
...
...
@@ -18,9 +19,10 @@ verType=stable # [stable, beta]
cpuType
=
x64
# [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType
=
Linux
# [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
pagMode
=
full
# [full | lite]
soMode
=
dynamic
# [static | dynamic]
verNumber
=
""
while
getopts
"hv:V:c:o:l:n:"
arg
while
getopts
"hv:V:c:o:l:
s:
n:"
arg
do
case
$arg
in
v
)
...
...
@@ -39,6 +41,10 @@ do
#echo "pagMode=$OPTARG"
pagMode
=
$(
echo
$OPTARG
)
;;
s
)
#echo "soMode=$OPTARG"
soMode
=
$(
echo
$OPTARG
)
;;
n
)
#echo "verNumber=$OPTARG"
verNumber
=
$(
echo
$OPTARG
)
...
...
@@ -53,6 +59,7 @@ do
echo
" -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] "
echo
" -V [stable | beta] "
echo
" -l [full | lite] "
echo
" -s [static | dynamic] "
echo
" -n [version number] "
exit
0
;;
...
...
@@ -63,7 +70,7 @@ do
esac
done
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
verNumber=
${
verNumber
}
"
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
soMode=
${
soMode
}
verNumber=
${
verNumber
}
"
curr_dir
=
$(
pwd
)
...
...
@@ -223,7 +230,7 @@ cd ${compile_dir}
# check support cpu type
if
[[
"
$cpuType
"
==
"x64"
]]
||
[[
"
$cpuType
"
==
"aarch64"
]]
||
[[
"
$cpuType
"
==
"aarch32"
]]
||
[[
"
$cpuType
"
==
"mips64"
]]
;
then
if
[
"
$verMode
"
!=
"cluster"
]
;
then
cmake ../
-DCPUTYPE
=
${
cpuType
}
-DPAGMODE
=
${
pagMode
}
cmake ../
-DCPUTYPE
=
${
cpuType
}
-DPAGMODE
=
${
pagMode
}
-DSOMODE
=
${
soMode
}
else
cmake ../../
-DCPUTYPE
=
${
cpuType
}
fi
...
...
src/cq/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -6,6 +6,10 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
IF
(
TD_LINUX
)
ADD_LIBRARY
(
tcq
${
SRC
}
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
tcq tutil common taos_static
)
ELSE
()
TARGET_LINK_LIBRARIES
(
tcq tutil common taos
)
ENDIF
()
ADD_SUBDIRECTORY
(
test
)
ENDIF
()
src/dnode/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -11,7 +11,11 @@ AUX_SOURCE_DIRECTORY(src SRC)
IF
(
TD_LINUX
)
ADD_EXECUTABLE
(
taosd
${
SRC
}
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
taosd mnode taos_static monitor http mqtt tsdb twal vnode cJson lz4 balance sync
)
ELSE
()
TARGET_LINK_LIBRARIES
(
taosd mnode taos monitor http mqtt tsdb twal vnode cJson lz4 balance sync
)
ENDIF
()
IF
(
TD_ACCOUNT
)
TARGET_LINK_LIBRARIES
(
taosd account
)
...
...
src/kit/shell/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -11,11 +11,11 @@ IF (TD_LINUX)
LIST
(
REMOVE_ITEM SRC ./src/shellDarwin.c
)
ADD_EXECUTABLE
(
shell
${
SRC
}
)
# IF (TD_PAGMODE_LITE)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
shell taos_static
)
ELSE
()
TARGET_LINK_LIBRARIES
(
shell taos
)
# ELSE ()
# TARGET_LINK_LIBRARIES(shell taos_static)
# ENDIF ()
ENDIF
()
SET_TARGET_PROPERTIES
(
shell PROPERTIES OUTPUT_NAME taos
)
ELSEIF
(
TD_WINDOWS
)
...
...
src/kit/taosdemo/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -8,11 +8,11 @@ IF (TD_LINUX)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_EXECUTABLE
(
taosdemo
${
SRC
}
)
# IF (TD_PAGMODE_LITE)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
taosdemo taos_static
)
ELSE
()
TARGET_LINK_LIBRARIES
(
taosdemo taos
)
# ELSE ()
# TARGET_LINK_LIBRARIES(taosdemo taos_static)
# ENDIF ()
ENDIF
()
ELSEIF
(
TD_WINDOWS
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_EXECUTABLE
(
taosdemo
${
SRC
}
)
...
...
src/plugins/http/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -11,7 +11,12 @@ AUX_SOURCE_DIRECTORY(src SRC)
IF
(
TD_LINUX
)
ADD_LIBRARY
(
http
${
SRC
}
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
http taos_static z
)
ELSE
()
TARGET_LINK_LIBRARIES
(
http taos z
)
ENDIF
()
IF
(
TD_ADMIN
)
TARGET_LINK_LIBRARIES
(
http admin
)
...
...
src/plugins/monitor/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -8,5 +8,10 @@ IF (TD_LINUX)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/client/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/query/inc
)
ADD_LIBRARY
(
monitor
${
SRC
}
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
monitor taos_static
)
ELSE
()
TARGET_LINK_LIBRARIES
(
monitor taos
)
ENDIF
()
ENDIF
()
src/plugins/mqtt/CMakeLists.txt
浏览文件 @
94c11e0f
...
...
@@ -10,8 +10,12 @@ IF (TD_LINUX)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/MQTT-C/include
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/MQTT-C/examples/templates
)
ADD_LIBRARY
(
mqtt
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
mqtt taos cJson mqttc
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
mqtt taos_static cJson mqttc
)
ELSE
()
TARGET_LINK_LIBRARIES
(
mqtt taos cJson mqttc
)
ENDIF
()
IF
(
TD_ADMIN
)
TARGET_LINK_LIBRARIES
(
mqtt admin cJson
)
ENDIF
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录