Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
16e01525
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,发现更多精彩内容 >>
提交
16e01525
编写于
8月 09, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
s3/mxml: remove os external dependency
上级
1290f529
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
6 deletion
+31
-6
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+28
-3
contrib/test/cos/CMakeLists.txt
contrib/test/cos/CMakeLists.txt
+2
-2
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+1
-1
未找到文件。
contrib/CMakeLists.txt
浏览文件 @
16e01525
...
...
@@ -124,6 +124,9 @@ endif(${BUILD_WITH_SQLITE})
# cos
if
(
${
BUILD_WITH_COS
}
)
file
(
MAKE_DIRECTORY
${
CMAKE_BINARY_DIR
}
/build/
)
set
(
CMAKE_PREFIX_PATH
${
CMAKE_BINARY_DIR
}
/build
)
cat
(
"
${
TD_SUPPORT_DIR
}
/mxml_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/cos_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
add_definitions
(
-DUSE_COS
)
endif
(
${
BUILD_WITH_COS
}
)
...
...
@@ -157,6 +160,21 @@ if(${BUILD_GEOS})
cat
(
"
${
TD_SUPPORT_DIR
}
/geos_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
()
# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-function")
# include(ExternalProject)
# ExternalProject_Add(mxml
# GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
# GIT_TAG release-2.10
# SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
# #BINARY_DIR ""
# BUILD_IN_SOURCE TRUE
# CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build
# BUILD_COMMAND make
# INSTALL_COMMAND make install
# TEST_COMMAND ""
# )
# download dependencies
configure_file
(
${
CONTRIB_TMP_FILE
}
"
${
TD_CONTRIB_DIR
}
/deps-download/CMakeLists.txt"
)
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-G
"
${
CMAKE_GENERATOR
}
"
.
...
...
@@ -355,7 +373,10 @@ endif()
# cos
if
(
${
BUILD_WITH_COS
}
)
if
(
NOT
${
TD_WINDOWS
}
)
#ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
option
(
ENABLE_TEST
"Enable the tests"
OFF
)
INCLUDE_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/build/include
)
set
(
CMAKE_BUILD_TYPE debug
)
set
(
ORIG_CMAKE_PROJECT_NAME
${
CMAKE_PROJECT_NAME
}
)
...
...
@@ -363,11 +384,15 @@ if(${BUILD_WITH_COS})
add_subdirectory
(
cos-c-sdk-v5 EXCLUDE_FROM_ALL
)
target_include_directories
(
cos_c_sdk
PUBLIC $<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/cos-c-sdk-v5/cos_c_sdk>
)
cos_c_sdk
PUBLIC $<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/cos-c-sdk-v5/cos_c_sdk>
)
set
(
CMAKE_PROJECT_NAME
${
ORIG_CMAKE_PROJECT_NAME
}
)
else
()
endif
(
NOT
${
TD_WINDOWS
}
)
endif
(
${
BUILD_WITH_COS
}
)
# lucene
...
...
contrib/test/cos/CMakeLists.txt
浏览文件 @
16e01525
...
...
@@ -39,11 +39,11 @@ target_include_directories(
find_library
(
APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/
)
find_library
(
APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/
)
find_library
(
MINIXML_LIBRARY mxml
)
#
find_library(MINIXML_LIBRARY mxml)
find_library
(
CURL_LIBRARY curl
)
target_link_libraries
(
cosTest cos_c_sdk
)
target_link_libraries
(
cosTest
${
APR_UTIL_LIBRARY
}
)
target_link_libraries
(
cosTest
${
APR_LIBRARY
}
)
target_link_libraries
(
cosTest
${
MINIXML_LIBRARY
}
)
target_link_libraries
(
cosTest
mxml
)
target_link_libraries
(
cosTest
${
CURL_LIBRARY
}
)
source/dnode/vnode/CMakeLists.txt
浏览文件 @
16e01525
...
...
@@ -137,7 +137,7 @@ endif()
find_library
(
APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/
)
find_library
(
APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/
)
find_library
(
MINIXML_LIBRARY mxml
)
#
find_library(MINIXML_LIBRARY mxml)
find_library
(
CURL_LIBRARY curl
)
target_link_libraries
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录