Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN产品汪
TDengine
提交
bd6f9ee9
T
TDengine
项目概览
CSDN产品汪
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
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,发现更多精彩内容 >>
提交
bd6f9ee9
编写于
8月 13, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-1047 change some definitions in arm64 platform
上级
dda20b1e
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
13 addition
and
25 deletion
+13
-25
cmake/define.inc
cmake/define.inc
+1
-0
cmake/install.inc
cmake/install.inc
+3
-11
cmake/platform.inc
cmake/platform.inc
+0
-1
src/os/CMakeLists.txt
src/os/CMakeLists.txt
+4
-8
src/os/inc/os.h
src/os/inc/os.h
+1
-1
src/os/src/linux/CMakeLists.txt
src/os/src/linux/CMakeLists.txt
+0
-0
src/os/src/linux/linuxEnv.c
src/os/src/linux/linuxEnv.c
+0
-0
src/rpc/test/CMakeLists.txt
src/rpc/test/CMakeLists.txt
+1
-1
src/sync/test/CMakeLists.txt
src/sync/test/CMakeLists.txt
+1
-1
src/wal/test/CMakeLists.txt
src/wal/test/CMakeLists.txt
+1
-1
tests/comparisonTest/tdengine/CMakeLists.txt
tests/comparisonTest/tdengine/CMakeLists.txt
+1
-1
未找到文件。
cmake/define.inc
浏览文件 @
bd6f9ee9
...
...
@@ -47,6 +47,7 @@ IF (TD_LINUX_32)
ENDIF
()
IF
(
TD_ARM_64
)
ADD_DEFINITIONS
(
-
D_M_X64
)
ADD_DEFINITIONS
(
-
D_TD_ARM_64_
)
ADD_DEFINITIONS
(
-
D_TD_ARM_
)
SET
(
COMMON_FLAGS
"-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE"
)
...
...
cmake/install.inc
浏览文件 @
bd6f9ee9
IF
(
TD_LINUX
_64
)
IF
(
TD_LINUX
)
SET
(
TD_MAKE_INSTALL_SH
"${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh"
)
INSTALL
(
CODE
"MESSAGE(
\"
make install script: ${TD_MAKE_INSTALL_SH}
\"
)"
)
INSTALL
(
CODE
"execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})"
)
INSTALL
(
CODE
"execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})"
)
ELSEIF
(
TD_LINUX_32
)
IF
(
NOT
TD_ARM
)
EXIT
()
ENDIF
()
SET
(
TD_MAKE_INSTALL_SH
"${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh"
)
INSTALL
(
CODE
"MESSAGE(
\"
make install script: ${TD_MAKE_INSTALL_SH}
\"
)"
)
INSTALL
(
CODE
"execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})"
)
INSTALL
(
CODE
"execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})"
)
ELSEIF
(
TD_WINDOWS_64
)
ELSEIF
(
TD_WINDOWS
)
SET
(
CMAKE_INSTALL_PREFIX
C
:/
TDengine
)
IF
(
NOT
TD_GODLL
)
#INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
...
...
@@ -33,7 +25,7 @@ ELSEIF (TD_WINDOWS_64)
INSTALL
(
FILES
$
{
LIBRARY_OUTPUT_PATH
}
/
libtaos
.
dll
DESTINATION
driver
)
INSTALL
(
FILES
$
{
LIBRARY_OUTPUT_PATH
}
/
libtaos
.
dll
.
a
DESTINATION
driver
)
ENDIF
()
ELSEIF
(
TD_DARWIN
_64
)
ELSEIF
(
TD_DARWIN
)
SET
(
TD_MAKE_INSTALL_SH
"${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh"
)
INSTALL
(
CODE
"MESSAGE(
\"
make install script: ${TD_MAKE_INSTALL_SH}
\"
)"
)
INSTALL
(
CODE
"execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})"
)
...
...
cmake/platform.inc
浏览文件 @
bd6f9ee9
...
...
@@ -43,7 +43,6 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
ELSEIF
(
$
{
CMAKE_SIZEOF_VOID_P
}
MATCHES
4
)
SET
(
TD_LINUX_32
TRUE
)
MESSAGE
(
STATUS
"The current platform is Linux 32-bit"
)
ELSE
()
MESSAGE
(
FATAL_ERROR
"The current platform is Linux neither 32-bit nor 64-bit, not supported yet"
)
EXIT
()
...
...
src/os/CMakeLists.txt
浏览文件 @
bd6f9ee9
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
(
TD_LINUX_64
)
ADD_SUBDIRECTORY
(
src/linux64
)
ELSEIF
(
TD_LINUX_32
)
ADD_SUBDIRECTORY
(
src/linux32
)
ELSEIF
(
TD_DARWIN_64
)
IF
(
TD_LINUX
)
ADD_SUBDIRECTORY
(
src/linux
)
ELSEIF
(
TD_DARWIN
)
ADD_SUBDIRECTORY
(
src/darwin
)
ELSEIF
(
TD_WINDOWS_64
)
ADD_SUBDIRECTORY
(
src/windows
)
ELSEIF
(
TD_WINDOWS_32
)
ELSEIF
(
TD_WINDOWS
)
ADD_SUBDIRECTORY
(
src/windows
)
ENDIF
()
...
...
src/os/inc/os.h
浏览文件 @
bd6f9ee9
...
...
@@ -24,7 +24,7 @@ extern "C" {
#include "osDarwin.h"
#endif
#ifdef _TD_ARM_64
#ifdef _TD_ARM_64
_
#include "osArm64.h"
#endif
...
...
src/os/src/linux
64
/CMakeLists.txt
→
src/os/src/linux/CMakeLists.txt
浏览文件 @
bd6f9ee9
文件已移动
src/os/src/linux
64
/linuxEnv.c
→
src/os/src/linux/linuxEnv.c
浏览文件 @
bd6f9ee9
文件已移动
src/rpc/test/CMakeLists.txt
浏览文件 @
bd6f9ee9
...
...
@@ -3,7 +3,7 @@ PROJECT(TDengine)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/rpc/inc
)
IF
(
TD_LINUX
_64
)
IF
(
TD_LINUX
)
LIST
(
APPEND CLIENT_SRC ./rclient.c
)
ADD_EXECUTABLE
(
rclient
${
CLIENT_SRC
}
)
TARGET_LINK_LIBRARIES
(
rclient trpc
)
...
...
src/sync/test/CMakeLists.txt
浏览文件 @
bd6f9ee9
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
(
TD_LINUX
_64
)
IF
(
TD_LINUX
)
INCLUDE_DIRECTORIES
(
../inc
)
LIST
(
APPEND CLIENT_SRC ./syncClient.c
)
...
...
src/wal/test/CMakeLists.txt
浏览文件 @
bd6f9ee9
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
(
TD_LINUX
_64
)
IF
(
TD_LINUX
)
INCLUDE_DIRECTORIES
(
../inc
)
LIST
(
APPEND WALTEST_SRC ./waltest.c
)
...
...
tests/comparisonTest/tdengine/CMakeLists.txt
浏览文件 @
bd6f9ee9
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
(
TD_LINUX
_64
)
IF
(
TD_LINUX
)
add_executable
(
tdengineTest tdengineTest.c
)
target_link_libraries
(
tdengineTest taos_static tutil common pthread
)
ENDIF
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录