Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4513acfe
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4513acfe
编写于
8月 11, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cos: use static libs for mxml, apr, apu, curl
上级
7085d6bc
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
10 deletion
+11
-10
cmake/apr-util_CMakeLists.txt.in
cmake/apr-util_CMakeLists.txt.in
+1
-1
cmake/apr_CMakeLists.txt.in
cmake/apr_CMakeLists.txt.in
+1
-1
cmake/curl_CMakeLists.txt.in
cmake/curl_CMakeLists.txt.in
+1
-1
cmake/mxml_CMakeLists.txt.in
cmake/mxml_CMakeLists.txt.in
+1
-1
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+4
-3
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+1
-1
tests/parallel_test/container_build.sh
tests/parallel_test/container_build.sh
+2
-2
未找到文件。
cmake/apr-util_CMakeLists.txt.in
浏览文件 @
4513acfe
...
...
@@ -11,7 +11,7 @@ ExternalProject_Add(aprutil-1
BUILD_IN_SOURCE TRUE
BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local/ --with-apr=$ENV{HOME}/.cos-local
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
.1
/ --with-apr=$ENV{HOME}/.cos-local
#CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
BUILD_COMMAND make
INSTALL_COMMAND make install
...
...
cmake/apr_CMakeLists.txt.in
浏览文件 @
4513acfe
...
...
@@ -11,7 +11,7 @@ ExternalProject_Add(apr-1
UPDATE_DISCONNECTED TRUE
BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
/
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
.1/ --enable-shared=no
#CONFIGURE_COMMAND ./configure
BUILD_COMMAND make
INSTALL_COMMAND make install
...
...
cmake/curl_CMakeLists.txt.in
浏览文件 @
4513acfe
...
...
@@ -9,7 +9,7 @@ ExternalProject_Add(curl
BUILD_IN_SOURCE TRUE
BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
--without-ssl
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
.1 --without-ssl --enable-shared=no
#CONFIGURE_COMMAND ./configure --without-ssl
BUILD_COMMAND make
INSTALL_COMMAND make install
...
...
cmake/mxml_CMakeLists.txt.in
浏览文件 @
4513acfe
...
...
@@ -6,7 +6,7 @@ ExternalProject_Add(mxml
#BINARY_DIR ""
BUILD_IN_SOURCE TRUE
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local --enable-shared=no
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local
.1
--enable-shared=no
#CONFIGURE_COMMAND ./configure
BUILD_COMMAND make
INSTALL_COMMAND make install
...
...
contrib/CMakeLists.txt
浏览文件 @
4513acfe
...
...
@@ -10,7 +10,7 @@ set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
configure_file
(
"
${
TD_SUPPORT_DIR
}
/deps_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
if
(
${
BUILD_WITH_COS
}
)
file
(
MAKE_DIRECTORY $ENV{HOME}/.cos-local/
)
file
(
MAKE_DIRECTORY $ENV{HOME}/.cos-local
.1
/
)
cat
(
"
${
TD_SUPPORT_DIR
}
/mxml_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/apr_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/curl_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
...
...
@@ -389,10 +389,11 @@ endif()
# cos
if
(
${
BUILD_WITH_COS
}
)
if
(
NOT
${
TD_WINDOWS
}
)
set
(
CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local
)
set
(
CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local
.1
)
#ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
option
(
ENABLE_TEST
"Enable the tests"
OFF
)
INCLUDE_DIRECTORIES
(
$ENV{HOME}/.cos-local/include
)
INCLUDE_DIRECTORIES
(
$ENV{HOME}/.cos-local.1/include
)
MESSAGE
(
"$ENV{HOME}/.cos-local.1/include"
)
set
(
CMAKE_BUILD_TYPE debug
)
set
(
ORIG_CMAKE_PROJECT_NAME
${
CMAKE_PROJECT_NAME
}
)
...
...
source/dnode/vnode/CMakeLists.txt
浏览文件 @
4513acfe
...
...
@@ -196,7 +196,7 @@ include_directories (${APR_INCLUDE_DIR})
target_include_directories
(
vnode
PUBLIC
"
${
TD_SOURCE_DIR
}
/contrib/cos-c-sdk-v5/cos_c_sdk"
PUBLIC
"$ENV{HOME}/.cos-local/include"
PUBLIC
"$ENV{HOME}/.cos-local
.1
/include"
)
if
(
${
BUILD_TEST
}
)
...
...
tests/parallel_test/container_build.sh
浏览文件 @
4513acfe
...
...
@@ -60,7 +60,7 @@ docker run \
-v
/root/.cargo/git:/root/.cargo/git
\
-v
/root/go/pkg/mod:/root/go/pkg/mod
\
-v
/root/.cache/go-build:/root/.cache/go-build
\
-v
/root/.cos-local
:/root/.cos-local
\
-v
/root/.cos-local
.1:/root/.cos-local.1
\
-v
${
REP_REAL_PATH
}
/enterprise/src/plugins/taosx/target:
${
REP_DIR
}
/enterprise/src/plugins/taosx/target
\
-v
${
REP_REAL_PATH
}
/community/tools/taosws-rs/target:
${
REP_DIR
}
/community/tools/taosws-rs/target
\
-v
${
REP_REAL_PATH
}
/community/contrib/cJson/:
${
REP_DIR
}
/community/contrib/cJson
\
...
...
@@ -89,7 +89,7 @@ docker run \
-v
/root/.cargo/git:/root/.cargo/git
\
-v
/root/go/pkg/mod:/root/go/pkg/mod
\
-v
/root/.cache/go-build:/root/.cache/go-build
\
-v
/root/.cos-local
:/root/.cos-local
\
-v
/root/.cos-local
.1:/root/.cos-local.1
\
-v
${
REP_REAL_PATH
}
/enterprise/src/plugins/taosx/target:
${
REP_DIR
}
/enterprise/src/plugins/taosx/target
\
-v
${
REP_REAL_PATH
}
/community/tools/taosws-rs/target:
${
REP_DIR
}
/community/tools/taosws-rs/target
\
-v
${
REP_REAL_PATH
}
/community/contrib/cJson/:
${
REP_DIR
}
/community/contrib/cJson
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录